Roland Dreier
4d3702b62e
x86: Rename "ignore" macro in <asm/dwarf2.h> to avoid collision
...
Commit 70f1bba4 ("x86: use ignore macro instead of hash comment") breaks
the 64-bit x86 build on toolchains that have CONFIG_AS_CFI undefined with:
arch/x86/lib/csum-copy_64.S:48: Error: Macro `ignore' was already defined
because <asm/dwarf2.h> now uses the ignore macro name itself. Fix this
by changing to __cfi_ignore in dwarf2.h.
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-14 20:40:39 -07:00
..
acpi
asm-alpha
asm-arm
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
2008-07-14 16:06:58 -07:00
asm-avr32
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
2008-07-14 13:37:29 -07:00
asm-blackfin
asm-cris
asm-frv
frv: fix irqs_disabled() to return an int, not an unsigned long
2008-07-12 14:33:42 -07:00
asm-generic
Merge branch 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6
2008-07-14 16:54:07 -07:00
asm-h8300
asm-ia64
asm-m32r
asm-m68k
asm-m68knommu
asm-mips
ALSA: ASoC: Au12x0/Au1550 PSC Audio support
2008-07-10 09:33:07 +02:00
asm-mn10300
asm-parisc
asm-powerpc
Merge branch 'tracing/ftrace' into auto-ftrace-next
2008-07-10 11:43:00 +02:00
asm-ppc
asm-s390
[S390] Remove P390 support.
2008-07-14 10:02:25 +02:00
asm-sh
asm-sparc
asm-sparc64
asm-um
asm-v850
asm-x86
x86: Rename "ignore" macro in <asm/dwarf2.h> to avoid collision
2008-07-14 20:40:39 -07:00
asm-xtensa
crypto
crypto: hash - Move ahash functions into crypto/hash.h
2008-07-10 20:35:18 +08:00
drm
drm: reorganise drm tree to be more future proof.
2008-07-14 10:45:01 +10:00
keys
linux
Merge branch 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6
2008-07-14 16:54:07 -07:00
math-emu
media
mtd
net
pcmcia
rdma
rxrpc
scsi
sound
ALSA: Release v1.0.17
2008-07-14 09:54:43 +02:00
video
xen
Kbuild
drm: reorganise drm tree to be more future proof.
2008-07-14 10:45:01 +10:00