The patch titled m68k/m68kmmu: use kbuild.h instead of defining macros in asm-offsets.c has been removed from the -mm tree. Its filename was m68k-m68kmmu-use-kbuildh-instead-of-defining-macros-in-asm-offsetsc.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: m68k/m68kmmu: use kbuild.h instead of defining macros in asm-offsets.c From: Christoph Lameter <clameter@xxxxxxx> Signed-off-by: Christoph Lameter <clameter@xxxxxxx> Cc: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> Cc: Roman Zippel <zippel@xxxxxxxxxxxxxx> Cc: Greg Ungerer <gerg@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/m68k/kernel/asm-offsets.c | 4 +--- arch/m68knommu/kernel/asm-offsets.c | 6 +----- 2 files changed, 2 insertions(+), 8 deletions(-) diff -puN arch/m68k/kernel/asm-offsets.c~m68k-m68kmmu-use-kbuildh-instead-of-defining-macros-in-asm-offsetsc arch/m68k/kernel/asm-offsets.c --- a/arch/m68k/kernel/asm-offsets.c~m68k-m68kmmu-use-kbuildh-instead-of-defining-macros-in-asm-offsetsc +++ a/arch/m68k/kernel/asm-offsets.c @@ -11,14 +11,12 @@ #include <linux/stddef.h> #include <linux/sched.h> #include <linux/kernel_stat.h> +#include <linux/kbuild.h> #include <asm/bootinfo.h> #include <asm/irq.h> #include <asm/amigahw.h> #include <linux/font.h> -#define DEFINE(sym, val) \ - asm volatile("\n->" #sym " %0 " #val : : "i" (val)) - int main(void) { /* offsets into the task struct */ diff -puN arch/m68knommu/kernel/asm-offsets.c~m68k-m68kmmu-use-kbuildh-instead-of-defining-macros-in-asm-offsetsc arch/m68knommu/kernel/asm-offsets.c --- a/arch/m68knommu/kernel/asm-offsets.c~m68k-m68kmmu-use-kbuildh-instead-of-defining-macros-in-asm-offsetsc +++ a/arch/m68knommu/kernel/asm-offsets.c @@ -13,15 +13,11 @@ #include <linux/kernel_stat.h> #include <linux/ptrace.h> #include <linux/hardirq.h> +#include <linux/kbuild.h> #include <asm/bootinfo.h> #include <asm/irq.h> #include <asm/thread_info.h> -#define DEFINE(sym, val) \ - asm volatile("\n->" #sym " %0 " #val : : "i" (val)) - -#define BLANK() asm volatile("\n->" : : ) - int main(void) { /* offsets into the task struct */ _ Patches currently in -mm which might be from clameter@xxxxxxx are origin.patch git-unionfs.patch git-slub.patch mm-add-a-basic-debugging-framework-for-memory-initialisation.patch mm-verify-the-page-links-and-memory-model.patch mm-make-defensive-checks-around-pfn-values-registered-for-memory-usage.patch mm-print-out-the-zonelists-on-request-for-manual-verification.patch mm-add-nr_writeback_temp-counter.patch remove-div_long_long_rem.patch slab-add-a-flag-to-prevent-debug_free-checks-on-a-kmem_cache.patch reiser4.patch reiser4-portion-of-zero_user-cleanup-patch.patch page-owner-tracking-leak-detector.patch x86-ioremap-add-checks-for-virtual-addresses.patch x86-ioremap-add-checks-for-virtual-addresses-fix.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