Merge branch 'core/header-fixes' into x86/headers

Conflicts:
	arch/x86/include/asm/setup.h

diff --combined arch/x86/include/asm/setup.h
index 45b40278b5824ba1a79acdfbc73a841a0055356d,5a3a1371575610a6b2bec11501691dc523cba7a0..c230189462a2f048c2a82d6cb037185edfaaaf92
--- 1/arch/x86/include/asm/setup.h
--- 2/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@@ -1,27 -1,10 +1,12 @@@
  #ifndef _ASM_X86_SETUP_H
  #define _ASM_X86_SETUP_H
  
 +#ifdef __KERNEL__
 +
  #define COMMAND_LINE_SIZE 2048
  
  #ifndef __ASSEMBLY__
  
- /* Interrupt control for vSMPowered x86_64 systems */
- void vsmp_init(void);
- 
- void setup_bios_corruption_check(void);
- 
- #ifdef CONFIG_X86_VISWS
- extern void visws_early_detect(void);
- extern int is_visws_box(void);
- #else
- static inline void visws_early_detect(void) { }
- static inline int is_visws_box(void) { return 0; }
- #endif
- 
- extern int wakeup_secondary_cpu_via_nmi(int apicid, unsigned long start_eip);
- extern int wakeup_secondary_cpu_via_init(int apicid, unsigned long start_eip);
  /*
   * Any setup quirks to be performed?
   */
@@@ -43,19 -26,15 +28,13 @@@ struct x86_quirks 
        void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
        void (*mpc_oem_pci_bus)(struct mpc_bus *m);
        void (*smp_read_mpc_oem)(struct mpc_oemtable *oemtable,
 -                                    unsigned short oemsize);
 +                              unsigned short oemsize);
        int (*setup_ioapic_ids)(void);
        int (*update_genapic)(void);
  };
  
- extern struct x86_quirks *x86_quirks;
- extern unsigned long saved_video_mode;
- 
- #ifndef CONFIG_PARAVIRT
- #define paravirt_post_allocator_init()        do {} while (0)
- #endif
  #endif /* __ASSEMBLY__ */
  
 -#ifdef __KERNEL__
 -
  #ifdef __i386__
  
  #include <linux/pfn.h>
@@@ -76,6 -55,28 +55,28 @@@
  #ifndef __ASSEMBLY__
  #include <asm/bootparam.h>
  
+ /* Interrupt control for vSMPowered x86_64 systems */
+ void vsmp_init(void);
+ 
+ void setup_bios_corruption_check(void);
+ 
+ #ifdef CONFIG_X86_VISWS
+ extern void visws_early_detect(void);
+ extern int is_visws_box(void);
+ #else
+ static inline void visws_early_detect(void) { }
+ static inline int is_visws_box(void) { return 0; }
+ #endif
+ 
+ extern int wakeup_secondary_cpu_via_nmi(int apicid, unsigned long start_eip);
+ extern int wakeup_secondary_cpu_via_init(int apicid, unsigned long start_eip);
+ extern struct x86_quirks *x86_quirks;
+ extern unsigned long saved_video_mode;
+ 
+ #ifndef CONFIG_PARAVIRT
+ #define paravirt_post_allocator_init()        do {} while (0)
+ #endif
+ 
  #ifndef _SETUP
  
  /*
@@@ -98,6 -99,7 +99,6 @@@ extern unsigned long init_pg_tables_sta
  extern unsigned long init_pg_tables_end;
  
  #else
 -void __init x86_64_init_pda(void);
  void __init x86_64_start_kernel(char *real_mode);
  void __init x86_64_start_reservations(char *real_mode_data);
  

diff --combined arch/x86/include/asm/syscalls.h
index 68b1be10cfadba52faa8a1f159b01bf5da3cb5fd,e26d34b0bc793a8c6671fa5ba65aedf50857b4d1..258ef730aaa4bccc884b9d28f0342b4275a94da2
--- 1/arch/x86/include/asm/syscalls.h
--- 2/arch/x86/include/asm/syscalls.h
+++ b/arch/x86/include/asm/syscalls.h
@@@ -29,21 -29,21 +29,21 @@@ asmlinkage int sys_get_thread_area(stru
  /* X86_32 only */
  #ifdef CONFIG_X86_32
  /* kernel/process_32.c */
 -asmlinkage int sys_fork(struct pt_regs);
 -asmlinkage int sys_clone(struct pt_regs);
 -asmlinkage int sys_vfork(struct pt_regs);
 -asmlinkage int sys_execve(struct pt_regs);
 +int sys_fork(struct pt_regs *);
 +int sys_clone(struct pt_regs *);
 +int sys_vfork(struct pt_regs *);
 +int sys_execve(struct pt_regs *);
  
  /* kernel/signal_32.c */
  asmlinkage int sys_sigsuspend(int, int, old_sigset_t);
  asmlinkage int sys_sigaction(int, const struct old_sigaction __user *,
                             struct old_sigaction __user *);
 -asmlinkage int sys_sigaltstack(unsigned long);
 -asmlinkage unsigned long sys_sigreturn(unsigned long);
 -asmlinkage int sys_rt_sigreturn(unsigned long);
 +int sys_sigaltstack(struct pt_regs *);
 +unsigned long sys_sigreturn(struct pt_regs *);
 +long sys_rt_sigreturn(struct pt_regs *);
  
  /* kernel/ioport.c */
 -asmlinkage long sys_iopl(unsigned long);
 +long sys_iopl(struct pt_regs *);
  
  /* kernel/sys_i386_32.c */
  asmlinkage long sys_mmap2(unsigned long, unsigned long, unsigned long,
@@@ -59,8 -59,8 +59,8 @@@ struct oldold_utsname
  asmlinkage int sys_olduname(struct oldold_utsname __user *);
  
  /* kernel/vm86_32.c */
 -asmlinkage int sys_vm86old(struct pt_regs);
 -asmlinkage int sys_vm86(struct pt_regs);
 +int sys_vm86old(struct pt_regs *);
 +int sys_vm86(struct pt_regs *);
  
  #else /* CONFIG_X86_32 */
  
@@@ -74,6 -74,7 +74,7 @@@ asmlinkage long sys_vfork(struct pt_reg
  asmlinkage long sys_execve(char __user *, char __user * __user *,
                           char __user * __user *,
                           struct pt_regs *);
+ long sys_arch_prctl(int, unsigned long);
  
  /* kernel/ioport.c */
  asmlinkage long sys_iopl(unsigned int, struct pt_regs *);