Patches contributed by Eötvös Lorand University
commit cdbfc557c43ea1f1f9b7062300ecb1254969814b
Merge: 4d8cc874d7ed 5b664cb235e9
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Jul 18 13:53:16 2008 +0200
Merge branch 'linus' into x86/cleanups
commit 2fb5e1e101d1b1c9a1aeca7ad99a02b49241ba7b
Merge: 34646bca4741 5b664cb235e9
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Jul 18 13:41:27 2008 +0200
Merge branch 'linus' into x86/paravirt-spinlocks
Conflicts:
arch/x86/kernel/Makefile
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --cc arch/x86/kernel/Makefile
index 78d52171400b,da140611bb57..058c5594f493
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@@ -7,11 -7,9 +7,10 @@@ extra-y := head_$(BITS).
CPPFLAGS_vmlinux.lds += -U$(UTS_MACHINE)
ifdef CONFIG_FTRACE
-# Do not profile debug utilities
+# Do not profile debug and lowlevel utilities
- CFLAGS_REMOVE_tsc_64.o = -pg
- CFLAGS_REMOVE_tsc_32.o = -pg
+ CFLAGS_REMOVE_tsc.o = -pg
CFLAGS_REMOVE_rtc.o = -pg
+CFLAGS_REMOVE_paravirt.o = -pg
endif
#
commit cd569ef5d6ff9f43e9504f1ffc7fdbe356518149
Merge: 6879827f4e08 5b664cb235e9
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Jul 18 12:20:23 2008 +0200
Merge branch 'linus' into x86/urgent
commit 48ae74443403ab25876959e84785f61bf421ccef
Merge: 1b82c9666a6f 5b664cb235e9
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Jul 18 10:14:56 2008 +0200
Merge branch 'linus' into x86/step
commit d88c16919793a9f5dc93e7956da5bb089c7600b4
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Jul 18 08:59:24 2008 +0200
Revert parts of "ftrace: do not trace scheduler functions"
the removal of -mno-spe in the !ftrace case was not intended.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/kernel/Makefile b/kernel/Makefile
index 985ddb7da4d0..15ab63ffe64d 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -11,6 +11,8 @@ obj-y = sched.o fork.o exec_domain.o panic.o printk.o profile.o \
hrtimer.o rwsem.o nsproxy.o srcu.o semaphore.o \
notifier.o ksysfs.o pm_qos_params.o sched_clock.o
+CFLAGS_REMOVE_sched.o = -mno-spe
+
ifdef CONFIG_FTRACE
# Do not trace debug files and internal ftrace files
CFLAGS_REMOVE_lockdep.o = -pg
commit 6879827f4e08da219c99b91e4e1d793a924103e3
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Jul 18 01:21:53 2008 +0200
x86: remove arch/x86/kernel/smpcommon_32.c
Yinghai Lu noticed that arch/x86/kernel/smpcommon_32.c got
renamed to arch/x86/kernel/smpcommon.c but the old almost-empty
file stayed around. Zap it.
Reported-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/arch/x86/kernel/smpcommon_32.c b/arch/x86/kernel/smpcommon_32.c
deleted file mode 100644
index 8b137891791f..000000000000
--- a/arch/x86/kernel/smpcommon_32.c
+++ /dev/null
@@ -1 +0,0 @@
-
commit 64d206d896ff70b828138577d5ff39deda5f1c4d
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Jul 18 00:26:59 2008 +0200
x86: rename CONFIG_NONPROMISC_DEVMEM to CONFIG_PROMISC_DEVMEM
Linus observed:
> The real bug is that we shouldn't have "double negatives", and
> certainly not negative config options. Making that "promiscuous
> /dev/mem" option a negated thing as a config option was bad.
right ... lets rename this option. There should never be a negation
in config options.
[ that reminds me of CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER, but that
is for another commit ;-) ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index ae36bfa814e5..f0cf5d990794 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -5,10 +5,11 @@ config TRACE_IRQFLAGS_SUPPORT
source "lib/Kconfig.debug"
-config NONPROMISC_DEVMEM
- bool "Filter access to /dev/mem"
+config PROMISC_DEVMEM
+ bool "Allow unlimited access to /dev/mem"
+ default y
help
- If this option is left off, you allow userspace access to all
+ If this option is left on, you allow userspace (root) access to all
of memory, including kernel and userspace memory. Accidental
access to this is obviously disastrous, but specific access can
be used by people debugging the kernel.
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index d4585077977a..c34dc483839c 100644
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -373,8 +373,8 @@ pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
return vma_prot;
}
-#ifdef CONFIG_NONPROMISC_DEVMEM
-/* This check is done in drivers/char/mem.c in case of NONPROMISC_DEVMEM*/
+#ifndef CONFIG_PROMISC_DEVMEM
+/* This check is done in drivers/char/mem.c in case of !PROMISC_DEVMEM*/
static inline int range_is_allowed(unsigned long pfn, unsigned long size)
{
return 1;
@@ -398,7 +398,7 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
}
return 1;
}
-#endif /* CONFIG_NONPROMISC_DEVMEM */
+#endif /* CONFIG_PROMISC_DEVMEM */
int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn,
unsigned long size, pgprot_t *vma_prot)
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 070e22e8ea9e..de05775bd687 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -80,7 +80,7 @@ static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t size)
}
#endif
-#ifdef CONFIG_NONPROMISC_DEVMEM
+#ifndef CONFIG_PROMISC_DEVMEM
static inline int range_is_allowed(unsigned long pfn, unsigned long size)
{
u64 from = ((u64)pfn) << PAGE_SHIFT;
commit 393d81aa026e19b6ede6f5f11955c97ee62e5df5
Merge: 93a0886e2368 5b664cb235e9
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Jul 17 23:57:20 2008 +0200
Merge branch 'linus' into xen-64bit
commit ffaa152efd02849c0c36947f533f2ee3ee55369a
Merge: 4fdf08b5bf8d f910d134442f
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Jul 17 23:32:58 2008 +0200
Merge branch 'x86/setup' of ssh://master.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into x86/setup
commit c43c1be0f7e0ac3d2fe1d4a5b37041c4c4463af1
Merge: e22146e610bb a3cf85932148
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Jul 17 19:24:56 2008 +0200
Merge branch 'linus' into x86/urgent