You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Ingo Molnar 8e9509c827 ftrace: fix merge buglet ... -tip testing found a bootup hang here: initcall anon_inode_init+0x0/0x130 returned 0 after 0 msecs calling acpi_event_init+0x0/0x57 the bootup should have continued with: initcall acpi_event_init+0x0/0x57 returned 0 after 45 msecs but it hung hard there instead. bisection led to this commit: | commit 5806b81ac1 | Merge: d14c8a6... 6712e29... | Author: Ingo Molnar <mingo@elte.hu> | Date: Mon Jul 14 16:11:52 2008 +0200 | Merge branch 'auto-ftrace-next' into tracing/for-linus turns out that i made this mistake in the merge: ifdef CONFIG_FTRACE # Do not profile debug utilities CFLAGS_REMOVE_tsc_64.o = -pg CFLAGS_REMOVE_tsc_32.o = -pg those two files got unified meanwhile - so the dont-profile annotation got lost. The proper rule is: CFLAGS_REMOVE_tsc.o = -pg i guess this could have been caught sooner if the CFLAGS_REMOVE* kbuild rule aborted the build if it met a target that does not exist anymore? Signed-off-by: Ingo Molnar <mingo@elte.hu>		17 years ago
..
alpha	Merge branch 'generic-ipi' into generic-ipi-for-linus	17 years ago
arm	Merge branch 'generic-ipi' into generic-ipi-for-linus	17 years ago
avr32	Merge branch 'core/stacktrace' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	17 years ago
blackfin	Merge commit 'v2.6.26' into bkl-removal	17 years ago
cris	Merge branch 'generic-ipi' into generic-ipi-for-linus	17 years ago
frv	Fix various old email addresses for dwmw2	17 years ago
h8300	[PATCH] take init_files to fs/file.c	17 years ago
ia64	Merge branch 'generic-ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	17 years ago
m32r	smp_call_function: get rid of the unused nonatomic/retry argument	17 years ago
m68k	Merge commit 'v2.6.26' into bkl-removal	17 years ago
m68knommu	m68knommu: init coldfire timer TRR with n - 1, not n	17 years ago
mips	Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus	17 years ago
mn10300	mn10300: provide __ucmpdi2() for MN10300	17 years ago
parisc	Merge branch 'generic-ipi' into generic-ipi-for-linus	17 years ago
powerpc	powerpc/ep8248e: Fix compile problem if !CONFIG_FS_ENET	17 years ago
s390	generic-ipi: more merge fallout	17 years ago
sh	Merge branch 'generic-ipi' into generic-ipi-for-linus	17 years ago
sparc	Merge commit 'v2.6.26' into bkl-removal	17 years ago
sparc64	Merge branch 'generic-ipi' into generic-ipi-for-linus	17 years ago
um	Merge branch 'generic-ipi' into generic-ipi-for-linus	17 years ago
v850	[PATCH] take init_files to fs/file.c	17 years ago
x86	ftrace: fix merge buglet	17 years ago
xtensa	[PATCH] take init_files to fs/file.c	17 years ago
.gitignore	…
Kconfig	Add generic helpers for arch IPI function calls	17 years ago