diff --git a/[refs] b/[refs]
index fe586dabc231..adce073e104a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eaf76e8b93dd5e7a53e2cd6db53f3ca18ca0fe4c
+refs/heads/master: 84c873ed2a00eab3e8ac49dc7889d7aad142ce22
diff --git a/trunk/include/asm-x86/proto.h b/trunk/include/asm-x86/proto.h
index 5a45478b5d3a..3c6fb89f1120 100644
--- a/trunk/include/asm-x86/proto.h
+++ b/trunk/include/asm-x86/proto.h
@@ -5,44 +5,27 @@
 
 /* misc architecture specific prototypes */
 
-struct cpuinfo_x86; 
-struct pt_regs;
-
 extern void early_idt_handler(void);
 
 extern void init_memory_mapping(unsigned long start, unsigned long end);
 
-extern void system_call(void); 
-extern int kernel_syscall(void);
+extern void system_call(void);
 extern void syscall_init(void);
 
 extern void ia32_syscall(void);
-extern void ia32_cstar_target(void); 
-extern void ia32_sysenter_target(void); 
-
-extern void config_acpi_tables(void);
-extern void ia32_syscall(void);
+extern void ia32_cstar_target(void);
+extern void ia32_sysenter_target(void);
 
 extern void reserve_bootmem_generic(unsigned long phys, unsigned len);
 
-extern void load_gs_index(unsigned gs);
-
-extern void exception_table_check(void);
-
-extern void swap_low_mappings(void);
-
 extern void syscall32_cpu_init(void);
 
 extern void check_efer(void);
 
 extern unsigned long table_start, table_end;
 
-extern int exception_trace;
-
 extern int reboot_force;
 
-extern int gsi_irq_sharing(int gsi);
-
 long do_arch_prctl(struct task_struct *task, int code, unsigned long addr);
 
 #define round_up(x,y) (((x) + (y) - 1) & ~((y)-1))