f5bb3a5e9d
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
...
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (79 commits)
Jesper Juhl is the new trivial patches maintainer
Documentation: mention email-clients.txt in SubmittingPatches
fs/binfmt_elf.c: spello fix
do_invalidatepage() comment typo fix
Documentation/filesystems/porting fixes
typo fixes in net/core/net_namespace.c
typo fix in net/rfkill/rfkill.c
typo fixes in net/sctp/sm_statefuns.c
lib/: Spelling fixes
kernel/: Spelling fixes
include/scsi/: Spelling fixes
include/linux/: Spelling fixes
include/asm-m68knommu/: Spelling fixes
include/asm-frv/: Spelling fixes
fs/: Spelling fixes
drivers/watchdog/: Spelling fixes
drivers/video/: Spelling fixes
drivers/ssb/: Spelling fixes
drivers/serial/: Spelling fixes
drivers/scsi/: Spelling fixes
...
2008-02-04 07:58:52 -08:00
9853832c49
Merge branch 'locks' of git://linux-nfs.org/~bfields/linux
...
* 'locks' of git://linux-nfs.org/~bfields/linux:
pid-namespaces-vs-locks-interaction
file locks: Use wait_event_interruptible_timeout()
locks: clarify posix_locks_deadlock
2008-02-04 07:58:03 -08:00
b21761ff18
kbuild: Fix instrumentation removal breakage on avr32
...
AVR32 still includes Kconfig.instrumentation, so it won't build after
this...
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com >
Acked-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2008-02-04 07:57:38 -08:00
519cb68807
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
...
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
scsi: fix dependency bug in aic7 Makefile
kbuild: add svn revision information to setlocalversion
kbuild: do not warn about __*init/__*exit symbols being exported
Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig
Add HAVE_KPROBES
Add HAVE_OPROFILE
Create arch/Kconfig
Fix ARM to play nicely with generic Instrumentation menu
kconfig: ignore select of unknown symbol
kconfig: mark config as changed when loading an alternate config
kbuild: Spelling/grammar fixes for config DEBUG_SECTION_MISMATCH
Remove __INIT_REFOK and __INITDATA_REFOK
kbuild: print only total number of section mismatces found
2008-02-04 07:56:17 -08:00
2f98735c9c
vm audit: add VM_DONTEXPAND to mmap for drivers that need it
...
Drivers that register a ->fault handler, but do not range-check the
offset argument, must set VM_DONTEXPAND in the vm_flags in order to
prevent an expanding mremap from overflowing the resource.
I've audited the tree and attempted to fix these problems (usually by
adding VM_DONTEXPAND where it is not obvious).
Signed-off-by: Nick Piggin <npiggin@suse.de >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2008-02-04 07:55:38 -08:00
fe2528b96b
ADB: Add missing #include <linux/platform_device.h>
...
Commit c9f6d3d5c6geert@linux-m68k.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2008-02-04 07:51:23 -08:00
795d45b22c
x86: fix RTC lockdep warning: potential hardirq recursion
...
After disabling both CONFIG_DEBUG_LOCKING_API_SELFTESTS and netconsole
(using current mainline) I get a login prompt, and also...
[ 5.181668] SELinux: policy loaded with handle_unknown=deny
[ 5.183315] type=1403 audit(1202100038.157:3): policy loaded auid=4294967295 ses=4294967295
[ 5.822073] SELinux: initialized (dev usbfs, type usbfs), uses genfs_contexts
[ 7.819146] ------------[ cut here ]------------
[ 7.819146] WARNING: at kernel/lockdep.c:2033 trace_hardirqs_on+0x9b/0x10d()
[ 7.819146] Modules linked in: generic ext3 jbd ide_disk ide_core
[ 7.819146] Pid: 399, comm: hwclock Not tainted 2.6.24 #4
[ 7.819146] [<c011d140>] warn_on_slowpath+0x41/0x51
[ 7.819146] [<c01364a9>] ? lock_release_holdtime+0x50/0x56
[ 7.819146] [<c013770c>] ? check_usage_forwards+0x19/0x3b
[ 7.819146] [<c01390c4>] ? __lock_acquire+0xac3/0xb0b
[ 7.819146] [<c0108c98>] ? native_sched_clock+0x8b/0x9f
[ 7.819146] [<c01364a9>] ? lock_release_holdtime+0x50/0x56
[ 7.819146] [<c030ca6c>] ? _spin_unlock_irq+0x22/0x42
[ 7.819146] [<c013848b>] trace_hardirqs_on+0x9b/0x10d
[ 7.819146] [<c030ca6c>] _spin_unlock_irq+0x22/0x42
[ 7.819146] [<c011481e>] hpet_rtc_interrupt+0xdf/0x290
[ 7.819146] [<c014ea90>] handle_IRQ_event+0x1a/0x46
[ 7.819146] [<c014f8ea>] handle_edge_irq+0xbe/0xff
[ 7.819146] [<c0106e08>] do_IRQ+0x6d/0x84
[ 7.819146] [<c0105596>] common_interrupt+0x2e/0x34
[ 7.819146] [<c013007b>] ? ktime_get_ts+0x8/0x3f
[ 7.819146] [<c0139420>] ? lock_release+0x167/0x16f
[ 7.819146] [<c017974a>] ? core_sys_select+0x2c/0x327
[ 7.819146] [<c0179792>] core_sys_select+0x74/0x327
[ 7.819146] [<c0108c98>] ? native_sched_clock+0x8b/0x9f
[ 7.819146] [<c01364a9>] ? lock_release_holdtime+0x50/0x56
[ 7.819146] [<c030ca6c>] ? _spin_unlock_irq+0x22/0x42
[ 7.819146] [<c01384d6>] ? trace_hardirqs_on+0xe6/0x10d
[ 7.819146] [<c030ca77>] ? _spin_unlock_irq+0x2d/0x42
[ 7.819146] [<c023b437>] ? rtc_do_ioctl+0x11b/0x677
[ 7.819146] [<c01c487e>] ? inode_has_perm+0x5e/0x68
[ 7.819146] [<c01364a9>] ? lock_release_holdtime+0x50/0x56
[ 7.819146] [<c0108c98>] ? native_sched_clock+0x8b/0x9f
[ 7.819146] [<c01c490b>] ? file_has_perm+0x83/0x8c
[ 7.819146] [<c023ba08>] ? rtc_ioctl+0xf/0x11
[ 7.819146] [<c017898d>] ? do_ioctl+0x55/0x67
[ 7.819146] [<c0179d15>] sys_select+0x93/0x163
[ 7.819146] [<c0104b39>] ? sysenter_past_esp+0x9a/0xa5
[ 7.819146] [<c0104afe>] sysenter_past_esp+0x5f/0xa5
[ 7.819146] =======================
[ 7.819146] ---[ end trace 96540ca301ffb84c ]---
[ 7.819210] rtc: lost 6 interrupts
[ 7.870668] type=1400 audit(1202128840.794:4): avc: denied { audit_write } for pid=399 comm="hwclock" capability=29 scontext=system_u:system_r:hwclock_t:s0 tcontext=system_u:system_r:hwclock_t:s0 tclass=capability
[ 9.538866] input: PC Speaker as /class/input/input5
Because hpet_rtc_interrupt()'s call to get_rtc_time() ends up
resolving to include/asm-generic/rtc.h's (hilariously inlined)
get_rtc_time(), which does spin_unlock_irq() from hard IRQ context.
The obvious patch fixes it.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-02-04 16:48:10 +01:00
7b610eec7a
x86: cpa, micro-optimization
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-02-04 16:48:10 +01:00
87f7f8fe32
x86: cpa, clean up code flow
...
Signed-off-by: Ingo Molnar <mingo@elte.hu >
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
2008-02-04 16:48:10 +01:00
beaff6333b
x86: cpa, eliminate CPA_ enum
...
Signed-off-by: Ingo Molnar <mingo@elte.hu >
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
2008-02-04 16:48:09 +01:00
9df84993cb
x86: cpa, cleanups
...
Signed-off-by: Ingo Molnar <mingo@elte.hu >
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
2008-02-04 16:48:09 +01:00
f07333fd14
x86: implement gbpages support in change_page_attr()
...
Signed-off-by: Andi Kleen <ak@suse.de >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
2008-02-04 16:48:09 +01:00
b536022227
x86: support gbpages in pagetable dump
...
Signed-off-by: Andi Kleen <ak@suse.de >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
2008-02-04 16:48:09 +01:00
c2f71ee214
x86: add gbpages support to lookup_address
...
[ tglx@linutronix.de: fix bootup crash on sparse mappings. ]
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-02-04 16:48:09 +01:00
61e19a347a
x86: add pgtable accessor functions for gbpages
...
Signed-off-by: Andi Kleen <ak@suse.de >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
2008-02-04 16:48:09 +01:00
fbff3c21af
x86: add PUD_PAGE_SIZE
...
a PUD entry covers 1GB of virtual memory.
Signed-off-by: Andi Kleen <ak@suse.de >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
2008-02-04 16:48:09 +01:00
019c3e7c5e
x86: add feature macros for the gbpages cpuid bit
...
Signed-off-by: Andi Kleen <ak@suse.de >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
2008-02-04 16:48:09 +01:00
d4f71f7969
x86: switch direct mapping setup over to set_pte
...
Use set_pte() for setting up the 2MB pages in the direct mapping.
Signed-off-by: Andi Kleen <ak@suse.de >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
2008-02-04 16:48:09 +01:00
7bfb72e847
x86: fix page-present check in cpa_flush_range
...
pte_present() might return true for PROT_NONE mappings.
Explicitely check the present bit.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-02-04 16:48:08 +01:00
6ce9fc17d9
x86: remove cpa warning
...
this race is legit and can happen on SMP systems.
Signed-off-by: Ingo Molnar <mingo@elte.hu >
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
2008-02-04 16:48:08 +01:00
bde1965ce8
x86: remove now unused clear_kernel_mapping
...
Signed-off-by: Andi Kleen <ak@suse.de >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
2008-02-04 16:48:08 +01:00
28d6ee41a6
x86: switch pci-gart over to using set_memory_np() instead of clear_kernel_mapping()
...
pci-gart needs to unmap the IOMMU aperture to prevent cache corruptions.
Switch this over to using set_memory_np() instead of clear_kernel_mapping().
Signed-off-by: Andi Kleen <ak@suse.de >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
2008-02-04 16:48:08 +01:00
64f351d197
x86: cpa selftest, skip non present entries
...
pud and pmd entries in the RAM area might be marked as non present.
Do not try to modify them in the selftest.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-02-04 16:48:08 +01:00
07cf89c05f
x86: CPA fix pagetable split
...
Move the readout of the large entry into the spinlock section to
prevent an unlikely but possible race.
Mark the pmd/pud entry present after the split. We preserved the
non present bit in the new split mapping.
Remove the stale gfp_flags double initialization.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-02-04 16:48:08 +01:00
31422c51e0
x86: rename LARGE_PAGE_SIZE to PMD_PAGE_SIZE
...
Fix up all users.
Signed-off-by: Andi Kleen <ak@suse.de >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
2008-02-04 16:48:08 +01:00
Linus Torvalds
Haavard Skinnemoen
Nick Piggin
Geert Uytterhoeven
Andrew Morton
Thomas Gleixner
Ingo Molnar
Andi Kleen