summary refs log tree commit diff
path: root/Kbuild
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2008-04-28 02:12:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-28 08:58:21 -0700
commitbf2ae2b37c06cc9fb6fc03d99617f1161939980f (patch)
tree3ffc871c7cf45eb08a51704f840778dda6db0cdc /Kbuild
parent726b80127239aeea9c8d8aad5b4e2c80313e3ce8 (diff)
downloadlinux-bf2ae2b37c06cc9fb6fc03d99617f1161939980f.tar.gz
pageflags: standardize comment inclusion in asm-offsets.h and fix MIPS
Add the ability to pass comments into asm-offsets.h by generating asm
output like

-># comment line

Mips needs this feature to preserve the comments that are in
asm-mips/asm-offsets.h right now.

Then remove the special handling for mips from Kbuild and convert mips to use
the new string to include the comments.

Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Kbuild')
-rw-r--r--Kbuild6
1 files changed, 3 insertions, 3 deletions
diff --git a/Kbuild b/Kbuild
index 7136de7b6fcb..32f19c5c9bb0 100644
--- a/Kbuild
+++ b/Kbuild
@@ -52,10 +52,10 @@ targets += arch/$(SRCARCH)/kernel/asm-offsets.s
 
 # Default sed regexp - multiline due to syntax constraints
 define sed-y
-	"/^->/{s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; s:->::; p;}"
+	"/^->/{s:->#\(.*\):/* \1 */:; \
+	s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \
+	s:->::; p;}"
 endef
-# Override default regexp for specific architectures
-sed-$(CONFIG_MIPS) := "/^@@@/{s/^@@@//; s/ \#.*\$$//; p;}"
 
 quiet_cmd_offsets = GEN     $@
 define cmd_offsets