diff --git a/[refs] b/[refs] index 3644468d76e7..9ee907a021c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a89518b882283fdb3e11fb6d1929dc874b380ca8 +refs/heads/master: 40fec50ac4dd436b06630f415789e57200c5b06f diff --git a/trunk/include/asm-x86/pda.h b/trunk/include/asm-x86/pda.h index 35962bbe5e72..3d9dd653628a 100644 --- a/trunk/include/asm-x86/pda.h +++ b/trunk/include/asm-x86/pda.h @@ -40,6 +40,7 @@ struct x8664_pda { extern struct x8664_pda *_cpu_pda[]; extern struct x8664_pda boot_cpu_pda[]; +extern void pda_init(int); #define cpu_pda(i) (_cpu_pda[i]) diff --git a/trunk/include/asm-x86/proto.h b/trunk/include/asm-x86/proto.h index 7ff3d765de05..8ed1ebf666be 100644 --- a/trunk/include/asm-x86/proto.h +++ b/trunk/include/asm-x86/proto.h @@ -9,7 +9,6 @@ struct cpuinfo_x86; struct pt_regs; extern void start_kernel(void); -extern void pda_init(int); extern void early_idt_handler(void);