The patch titled prep-for-paravirt-desch-clearer-parameter-names fix has been removed from the -mm tree. Its filename was prep-for-paravirt-desch-clearer-parameter-names-fix.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: prep-for-paravirt-desch-clearer-parameter-names fix From: Rusty Russell <rusty@xxxxxxxxxxxxxxx> On Thu, 2006-10-26 at 22:19 -0700, akpm@xxxxxxxx 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 <rusty@xxxxxxxxxxxxxxx> Cc: Jeremy Fitzhardinge <jeremy@xxxxxxxx> Cc: Andi Kleen <ak@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- 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; _ Patches currently in -mm which might be from rusty@xxxxxxxxxxxxxxx are origin.patch prep-for-paravirt-be-careful-about-touching-bios.patch prep-for-paravirt-be-careful-about-touching-bios-warning-fix.patch paravirtualization-header-and-stubs-for-fix.patch paravirtualization-patch-inline-replacements-for-fix-2.patch paravirtualization-patch-inline-replacements-for-fix-3.patch paravirtualization-more-generic-paravirtualization-warning-fix.patch generic-bug-implementation.patch generic-bug-for-i386.patch generic-bug-for-x86-64.patch bug-test-1.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html