The patch titled
s390: use kbuild.h instead of defining macros in asm-offsets.c
has been removed from the -mm tree. Its filename was
s390-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: s390: use kbuild.h instead of defining macros in asm-offsets.c
From: Christoph Lameter <clameter@xxxxxxx>
s390 has a strange marker in DEFINE. Undefine the DEFINE from kbuild.h and
define it the way s390 wants it to preserve things as they were.
May be good if the arch maintainer could go over this and check if this
workaround is really necessary.
Signed-off-by: Christoph Lameter <clameter@xxxxxxx>
Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Cc: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/s390/kernel/asm-offsets.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff -puN arch/s390/kernel/asm-offsets.c~s390-use-kbuildh-instead-of-defining-macros-in-asm-offsetsc arch/s390/kernel/asm-offsets.c
--- a/arch/s390/kernel/asm-offsets.c~s390-use-kbuildh-instead-of-defining-macros-in-asm-offsetsc
+++ a/arch/s390/kernel/asm-offsets.c
@@ -5,14 +5,13 @@
*/
#include <linux/sched.h>
+#include <linux/kbuild.h>
/* Use marker if you need to separate the values later */
-
+#undef DEFINE
#define DEFINE(sym, val, marker) \
asm volatile("\n->" #sym " %0 " #val " " #marker : : "i" (val))
-#define BLANK() asm volatile("\n->" : : )
-
int main(void)
{
DEFINE(__THREAD_info, offsetof(struct task_struct, stack),);
_
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
