summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2010-10-27 18:28:32 +0200
committerDavid Howells <dhowells@redhat.com>2010-10-27 18:28:32 +0200
commit95a2f6f72d37762ba1b3d6c8031f66a6467a63df (patch)
tree92fe1c6b784d8c3f5a0f43b0f665ef7405d63eee
parentfix braino in fs: do not assign default i_ino in new_inode (diff)
downloadlinux-95a2f6f72d37762ba1b3d6c8031f66a6467a63df.tar.xz
linux-95a2f6f72d37762ba1b3d6c8031f66a6467a63df.zip
Partially revert patch that encloses asm-offset.h numbers in brackets
Partially revert patch: commit 3234282f33b29d349bcada40204fc7c8fda7fe72 Author: Jan Beulich <JBeulich@novell.com> Date: Tue Oct 19 14:52:26 2010 +0100 x86, asm: Fix CFI macro invocations to deal with shortcomings in gas This breaks MN10300 arch as this changes many instances of instructions similar to the following: MOV number,D0 which represents an immediate value load into: MOV (number),D0 which the assembler then interprets as a load from absolute address. arch/mn10300/kernel/entry.S:64: Error: Invalid opcode/operands arch/mn10300/kernel/entry.S:65: Error: junk at end of line, first unrecognized character is `0' arch/mn10300/kernel/entry.S:74: Error: Invalid opcode/operands arch/mn10300/kernel/entry.S:74: Error: junk at end of line, first unrecognized character is `1' arch/mn10300/kernel/entry.S:75: Error: Invalid opcode/operands arch/mn10300/kernel/entry.S:76: Error: junk at end of line, first unrecognized character is `0' cc: Jan Beulich <jbeulich@novell.com> cc: Alexander van Heukelum <heukelum@fastmail.fm> cc: H. Peter Anvin <hpa@linux.intel.com> cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: David Howells <dhowells@redhat.com>
-rw-r--r--Kbuild2
1 files changed, 1 insertions, 1 deletions
diff --git a/Kbuild b/Kbuild
index 431f7ca2404c..b00037ad7e03 100644
--- a/Kbuild
+++ b/Kbuild
@@ -53,7 +53,7 @@ targets += arch/$(SRCARCH)/kernel/asm-offsets.s
# Default sed regexp - multiline due to syntax constraints
define sed-y
"/^->/{s:->#\(.*\):/* \1 */:; \
- s:^->\([^ ]*\) [\$$#]*\([-0-9]*\) \(.*\):#define \1 (\2) /* \3 */:; \
+ s:^->\([^ ]*\) [\$$#]*\([-0-9]*\) \(.*\):#define \1 \2 /* \3 */:; \
s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \
s:->::; p;}"
endef