Pull x86 cleanups from Ingo Molnar: "This topic tree contains more commits than usual: - most of it are uaccess cleanups/reorganization by Al - there's a bunch of prototype declaration (--Wmissing-prototypes) cleanups - misc other cleanups all around the map" * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (36 commits) x86/mm/set_memory: Fix -Wmissing-prototypes warnings x86/efi: Add a prototype for efi_arch_mem_reserve() x86/mm: Mark setup_emu2phys_nid() static x86/jump_label: Move 'inline' keyword placement x86/platform/uv: Add a missing prototype for uv_bau_message_interrupt() kill uaccess_try() x86: unsafe_put-style macro for sigmask x86: x32_setup_rt_frame(): consolidate uaccess areas x86: __setup_rt_frame(): consolidate uaccess areas x86: __setup_frame(): consolidate uaccess areas x86: setup_sigcontext(): list user_access_{begin,end}() into callers x86: get rid of put_user_try in __setup_rt_frame() (both 32bit and 64bit) x86: ia32_setup_rt_frame(): consolidate uaccess areas x86: ia32_setup_frame(): consolidate uaccess areas x86: ia32_setup_sigcontext(): lift user_access_{begin,end}() into the callers x86/alternatives: Mark text_poke_loc_init() static x86/cpu: Fix a -Wmissing-prototypes warning for init_ia32_feat_ctl() x86/mm: Drop pud_mknotpresent() x86: Replace setup_irq() by request_irq() x86/configs: Slightly reduce defconfigs ...
Showing the changes to include/linux (3 of 43 files). Show all
Unified · Split
| @@ -454,12 +454,13 @@ extern void __user *compat_alloc_user_space(unsigned long len); · 453 unmodified lines | ||
| 454 | 454 | |
| 455 | 455 | int compat_restore_altstack(const compat_stack_t __user *uss); |
| 456 | 456 | int __compat_save_altstack(compat_stack_t __user *, unsigned long); |
| 457 | −#define compat_save_altstack_ex(uss, sp) do { \ | |
| 457 | +#define unsafe_compat_save_altstack(uss, sp, label) do { \ | |
| 458 | 458 | compat_stack_t __user *__uss = uss; \ |
| 459 | 459 | struct task_struct *t = current; \ |
| 460 | − put_user_ex(ptr_to_compat((void __user *)t->sas_ss_sp), &__uss->ss_sp); \ | |
| 461 | − put_user_ex(t->sas_ss_flags, &__uss->ss_flags); \ | |
| 462 | − put_user_ex(t->sas_ss_size, &__uss->ss_size); \ | |
| 460 | + unsafe_put_user(ptr_to_compat((void __user *)t->sas_ss_sp), \ | |
| 461 | + &__uss->ss_sp, label); \ | |
| 462 | + unsafe_put_user(t->sas_ss_flags, &__uss->ss_flags, label); \ | |
| 463 | + unsafe_put_user(t->sas_ss_size, &__uss->ss_size, label); \ | |
| 463 | 464 | if (t->sas_ss_flags & SS_AUTODISARM) \ |
| 464 | 465 | sas_ss_reset(t); \ |
| 465 | 466 | } while (0); |
| @@ -1243,4 +1243,6 @@ struct linux_efi_memreserve { · 1242 unmodified lines | ||
| 1243 | 1243 | #define EFI_MEMRESERVE_COUNT(size) (((size) - sizeof(struct linux_efi_memreserve)) \ |
| 1244 | 1244 | / sizeof(((struct linux_efi_memreserve *)0)->entry[0])) |
| 1245 | 1245 | |
| 1246 | +void __init efi_arch_mem_reserve(phys_addr_t addr, u64 size); | |
| 1247 | + | |
| 1246 | 1248 | #endif /* _LINUX_EFI_H */ |
| @@ -444,12 +444,12 @@ void signals_init(void); · 443 unmodified lines | ||
| 444 | 444 | int restore_altstack(const stack_t __user *); |
| 445 | 445 | int __save_altstack(stack_t __user *, unsigned long); |
| 446 | 446 | |
| 447 | −#define save_altstack_ex(uss, sp) do { \ | |
| 447 | +#define unsafe_save_altstack(uss, sp, label) do { \ | |
| 448 | 448 | stack_t __user *__uss = uss; \ |
| 449 | 449 | struct task_struct *t = current; \ |
| 450 | − put_user_ex((void __user *)t->sas_ss_sp, &__uss->ss_sp); \ | |
| 451 | − put_user_ex(t->sas_ss_flags, &__uss->ss_flags); \ | |
| 452 | − put_user_ex(t->sas_ss_size, &__uss->ss_size); \ | |
| 450 | + unsafe_put_user((void __user *)t->sas_ss_sp, &__uss->ss_sp, label); \ | |
| 451 | + unsafe_put_user(t->sas_ss_flags, &__uss->ss_flags, label); \ | |
| 452 | + unsafe_put_user(t->sas_ss_size, &__uss->ss_size, label); \ | |
| 453 | 453 | if (t->sas_ss_flags & SS_AUTODISARM) \ |
| 454 | 454 | sas_ss_reset(t); \ |
| 455 | 455 | } while (0); |