From: Rusty Russell On Thu, 2006-10-26 at 22:19 -0700, akpm@osdl.org wrote: > The patch titled > Prep for paravirt: desc.h clearer parameter names, some code motion > has been added to the -mm tree. Its filename is > prep-for-paravirt-desch-clearer-parameter-names.patch And here's the fix: moving those macros down breaks compile. Signed-off-by: Rusty Russell Cc: Jeremy Fitzhardinge Cc: Andi Kleen Signed-off-by: Andrew Morton --- include/asm-i386/desc.h | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff -puN include/asm-i386/desc.h~prep-for-paravirt-desch-clearer-parameter-names-fix include/asm-i386/desc.h --- a/include/asm-i386/desc.h~prep-for-paravirt-desch-clearer-parameter-names-fix +++ a/include/asm-i386/desc.h @@ -78,6 +78,17 @@ static inline void load_TLS(struct threa #undef C } +#define write_ldt_entry(dt, entry, low, high) write_dt_entry(dt,entry,low,high) +#define write_gdt_entry(dt, entry, low, high) write_dt_entry(dt,entry,low,high) +#define write_idt_entry(dt, entry, low, high) write_dt_entry(dt,entry,low,high) + +static inline void write_dt_entry(void *dt, int entry, u32 entry_low, u32 entry_high) +{ + u32 *lp = (u32 *)((char *)dt + entry*8); + lp[0] = entry_low; + lp[1] = entry_high; +} + static inline void set_ldt(void *addr, unsigned int entries) { if (likely(entries == 0)) @@ -94,17 +105,6 @@ static inline void set_ldt(void *addr, u } } -#define write_ldt_entry(dt, entry, low, high) write_dt_entry(dt,entry,low,high) -#define write_gdt_entry(dt, entry, low, high) write_dt_entry(dt,entry,low,high) -#define write_idt_entry(dt, entry, low, high) write_dt_entry(dt,entry,low,high) - -static inline void write_dt_entry(void *dt, int entry, u32 entry_low, u32 entry_high) -{ - u32 *lp = (u32 *)((char *)dt + entry*8); - lp[0] = entry_low; - lp[1] = entry_high; -} - static inline void _set_gate(int gate, unsigned int type, void *addr, unsigned short seg) { u32 low, high; _