aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-03-30powerpc: Implement dma_mmap_coherent()Benjamin Herrenschmidt3-0/+44
This is used by Alsa to mmap buffers allocated with dma_alloc_coherent() into userspace. We need a special variant to handle machines with non-coherent DMAs as those buffers have "special" virt addresses and require non-cachable mappings Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-03-30powerpc/nvram: Don't overwrite oops/panic report on normal shutdownJim Keniston1-0/+24
For normal halt, reboot, and poweroff events, refrain from overwriting the lnx,oops-log partition. Also, don't save the dmesg buffer on an emergency-restart event if we've already saved it earlier in panic(). Signed-off-by: Jim Keniston <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-03-30powerpc: Restore some misc devices to our configsStephen Rothwell15-0/+15
Uwe Kleine-König reported: while working on an defconfig (arm/mx27) I noticed that just updating it[1] results in removing CONFIG_EEPROM_AT24=y. The reason is that since commit v2.6.36-5965-g5f2365d (misc devices: do not enable by default) MISC_DEVICES isn't enabled anymore by default. So all defconfigs that have CONFIG_SOME_SYMBOL=y (or =m) (with SOME_SYMBOL depending on MISC_DEVICES) but not CONFIG_MISC_DEVICES=y suffer from the same problem. This restores those misc devices to the powerpc defconfigs. Signed-off-by: Stephen Rothwell <[email protected]> Cc: Uwe Kleine-König <[email protected] Acked-by: Josh Boyer <[email protected]> Acked-by: Uwe Kleine-König Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-03-30sound: Fixup the last user of the old irq functionsThomas Gleixner1-1/+1
I had seen that before, but now that I removed set_irq_wake it broke. Signed-off-by: Thomas Gleixner <[email protected]>
2011-03-30genirq: Remove obsolete commentThomas Gleixner1-7/+0
Signed-off-by: Thomas Gleixner <[email protected]>
2011-03-30genirq: Remove now obsolete set_irq_wake()Thomas Gleixner1-8/+0
Missed that one in the big compat remval patch Signed-off-by: Thomas Gleixner <[email protected]>
2011-03-30sh: Fix irq cleanup falloutThomas Gleixner1-2/+2
I missed that coccinelle does not fix up header files by default. Reported-by: Rafael J. Wysocki <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Cc: Paul Mundt <[email protected]> Cc: <[email protected]>
2011-03-30x86: apb_timer: Fixup genirq falloutThomas Gleixner1-1/+1
The lonely user of the internal interface was not in the coccinelle script. Reported-by: Randy Dunlap <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]>
2011-03-29Merge branches 'fixes' and 'devel-stable' into for-linusRussell King88-616/+1114
2011-03-29genirq: Fix misnamed label in handle_edge_eoi_irqThomas Gleixner1-1/+1
Reported-by: [email protected] Signed-off-by: Thomas Gleixner <[email protected]> Cc: [email protected]
2011-03-29libceph: Create a new key type "ceph".Tommi Virtanen4-8/+85
This allows us to use existence of the key type as a feature test, from userspace. Signed-off-by: Tommi Virtanen <[email protected]> Signed-off-by: Sage Weil <[email protected]>
2011-03-29libceph: Get secret from the kernel keys api when mounting with key=NAME.Tommi Virtanen2-0/+59
Signed-off-by: Tommi Virtanen <[email protected]> Signed-off-by: Sage Weil <[email protected]>
2011-03-29ceph: Move secret key parsing earlier.Tommi Virtanen9-19/+63
This makes the base64 logic be contained in mount option parsing, and prepares us for replacing the homebew key management with the kernel key retention service. Signed-off-by: Tommi Virtanen <[email protected]> Signed-off-by: Sage Weil <[email protected]>
2011-03-29libceph: fix null dereference when unregistering linger requestsSage Weil1-3/+3
We should only clear r_osd if we are neither registered as a linger or a regular request. We may unregister as a linger while still registered as a regular request (e.g., in reset_osd). Incorrectly clearing r_osd there leads to a null pointer dereference in __send_request. Also simplify the parallel check in __unregister_request() where we just removed r_osd_item and know it's empty. Signed-off-by: Sage Weil <[email protected]>
2011-03-29Linux 2.6.39-rc1Linus Torvalds1-2/+2
2011-03-29Merge branch 'for-linus' of ↵Linus Torvalds31-1396/+1615
git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (26 commits) mmc: SDHI should depend on SUPERH || ARCH_SHMOBILE mmc: tmio_mmc: Move some defines into a shared header mmc: tmio: support aggressive clock gating mmc: tmio: fix power-mode interpretation mmc: tmio: remove work-around for unmasked SDIO interrupts sh: fix SDHI IO address-range ARM: mach-shmobile: fix SDHI IO address-range mmc: tmio: only access registers above 0xff, if available mfd: remove now redundant sh_mobile_sdhi.h header sh: convert boards to use linux/mmc/sh_mobile_sdhi.h ARM: mach-shmobile: convert boards to use linux/mmc/sh_mobile_sdhi.h mmc: tmio: convert the SDHI MMC driver from MFD to a platform driver sh: ecovec: use the CONFIG_MMC_TMIO symbols instead of MFD mmc: tmio: split core functionality, DMA and MFD glue mmc: tmio: use PIO for short transfers mmc: tmio-mmc: Improve DMA stability on sh-mobile mmc: fix mmc_app_send_scr() for dma transfer mmc: sdhci-esdhc: enable esdhc on imx53 mmc: sdhci-esdhc: use writel/readl as general APIs mmc: sdhci: add the abort CMDTYPE bits definition ...
2011-03-29Merge branch 'frv' of ↵Linus Torvalds7-27/+76
git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-frv * 'frv' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-frv: FRV: Use generic show_interrupts() FRV: Convert genirq namespace frv: Select GENERIC_HARDIRQS_NO_DEPRECATED frv: Convert cpu irq_chip to new functions frv: Convert mb93493 irq_chip to new functions frv: Convert mb93093 irq_chip to new function frv: Convert mb93091 irq_chip to new functions frv: Fix typo from __do_IRQ overhaul frv: Remove stale irq_chip.end FRV: Do some cleanups FRV: Missing node arg in alloc_thread_info_node() macro NOMMU: implement access_remote_vm NOMMU: support SMP dynamic percpu_alloc NOMMU: percpu should use is_vmalloc_addr().
2011-03-29Merge branch 'stable/bug-fixes-rc1' of ↵Linus Torvalds2-6/+10
git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen * 'stable/bug-fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen: Use new irq_move functions xen: Convert genirq namespace xen: fix p2m section mismatches xen/p2m: Allocate p2m tracking pages on override xen-gntdev: unlock on error path in gntdev_mmap() xen-gntdev: return -EFAULT on copy_to_user failure
2011-03-29Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdogLinus Torvalds7-56/+67
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: watchdog: softdog.c: enhancement to optionally invoke panic instead of reboot on timer expiry watchdog: fix nv_tco section mismatch watchdog: sp5100_tco.c: Check if firmware has set correct value in tcobase. watchdog: Convert release_resource to release_region/release_mem_region watchdog: s3c2410_wdt.c: Convert release_resource to release_region/release_mem_region
2011-03-29Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bpLinus Torvalds1-1/+1
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: amd64_edac: Fix potential memleak
2011-03-29Merge branch 'irq-final-for-linus-v2' of ↵Linus Torvalds409-3705/+2710
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'irq-final-for-linus-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (111 commits) gpio: ab8500: Mark broken genirq: Remove move_*irq leftovers genirq: Remove compat code drivers: Final irq namespace conversion mn10300: Use generic show_interrupts() mn10300: Cleanup irq_desc access mn10300: Convert genirq namespace frv: Use generic show_interrupts() frv: Convert genirq namespace frv: Select GENERIC_HARDIRQS_NO_DEPRECATED frv: Convert cpu irq_chip to new functions frv: Convert mb93493 irq_chip to new functions frv: Convert mb93093 irq_chip to new function frv: Convert mb93091 irq_chip to new functions frv: Fix typo from __do_IRQ overhaul frv: Remove stale irq_chip.end m68k: Convert irq function namespace xen: Use new irq_move functions xen: Cleanup genirq namespace unicore32: Use generic show_interrupts() ...
2011-03-29char/tpm: Fix unitialized usage of data bufferPeter Huewe1-1/+1
This patch fixes information leakage to the userspace by initializing the data buffer to zero. Reported-by: Peter Huewe <[email protected]> Signed-off-by: Peter Huewe <[email protected]> Signed-off-by: Marcel Selhorst <[email protected]> [ Also removed the silly "* sizeof(u8)". If that isn't 1, we have way deeper problems than a simple multiplication can fix. - Linus ] Signed-off-by: Linus Torvalds <[email protected]>
2011-03-29amd64_edac: Fix potential memleakBorislav Petkov1-1/+1
We check the pointers together but at least one of them could be invalid due to failed allocation. Since we cannot continue if either of the two allocations has failed, exit early by freeing them both. Cc: <[email protected]> # 38.x Reported-by: Mauro Carvalho Chehab <[email protected]> Signed-off-by: Borislav Petkov <[email protected]>
2011-03-29ceph: unlock on error in ceph_osdc_start_request()Dan Carpenter1-1/+3
There was a missing unlock on the error path if __map_request() failed. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Sage Weil <[email protected]>
2011-03-29fs: don't use igrab() while holding i_lockDave Chinner3-4/+5
Fix the incorrect use of igrab() inside the i_lock in NFS and Ceph‥ If we are already holding the i_lock, we have a reference to the inode so we can safely use ihold() to gain an extra reference. This avoids hangs due to lock recursion on the i_lock now that the inode_lock is gone and igrab() uses the i_lock itself. Signed-off-by: Dave Chinner <[email protected]> Cc: Al Viro <[email protected]> Cc: [email protected] Cc: Ryan Mallon <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-03-29Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds44-192/+329
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (30 commits) xfrm: Restrict extended sequence numbers to esp xfrm: Check for esn buffer len in xfrm_new_ae xfrm: Assign esn pointers when cloning a state xfrm: Move the test on replay window size into the replay check functions netdev: bfin_mac: document TE setting in RMII modes drivers net: Fix declaration ordering in inline functions. cxgb3: Apply interrupt coalescing settings to all queues net: Always allocate at least 16 skb frags regardless of page size ipv4: Don't ip_rt_put() an error pointer in RAW sockets. net: fix ethtool->set_flags not intended -EINVAL return value mlx4_en: Fix loss of promiscuity tg3: Fix inline keyword usage tg3: use <linux/io.h> and <linux/uaccess.h> instead <asm/io.h> and <asm/uaccess.h> net: use CHECKSUM_NONE instead of magic number Net / jme: Do not use legacy PCI power management myri10ge: small rx_done refactoring bridge: notify applications if address of bridge device changes ipv4: Fix IP timestamp option (IPOPT_TS_PRESPEC) handling in ip_options_echo() can: c_can: Fix tx_bytes accounting can: c_can_platform: fix irq check in probe ...
2011-03-29xen: Use new irq_move functionsThomas Gleixner1-2/+2
These functions take irq_data as an argument and avoid a redundant lookup in the sparse irq case. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Ian Campbell <[email protected]> Cc: Jeremy Fitzhardinge <[email protected]> Cc: Konrad Rzeszutek Wilk <[email protected]> Signed-off-by: Konrad Rzeszutek Wilk <[email protected]>
2011-03-29xen: Convert genirq namespaceThomas Gleixner1-11/+11
Converted with coccinelle. Signed-off-by: Thomas Gleixner <[email protected]> Acked-by: Ian Campbell <[email protected]> Signed-off-by: Konrad Rzeszutek Wilk <[email protected]>
2011-03-29xen: fix p2m section mismatchesRandy Dunlap1-2/+2
Fix section mismatch warnings: set_phys_range_identity() is called by __init xen_set_identity(), so also mark set_phys_range_identity() as __init. then: __early_alloc_p2m() is called set_phys_range_identity(), so also mark __early_alloc_p2m() as __init. WARNING: arch/x86/built-in.o(.text+0x7856): Section mismatch in reference from the function __early_alloc_p2m() to the function .init.text:extend_brk() The function __early_alloc_p2m() references the function __init extend_brk(). This is often because __early_alloc_p2m lacks a __init annotation or the annotation of extend_brk is wrong. WARNING: arch/x86/built-in.o(.text+0x7967): Section mismatch in reference from the function set_phys_range_identity() to the function .init.text:extend_brk() The function set_phys_range_identity() references the function __init extend_brk(). This is often because set_phys_range_identity lacks a __init annotation or the annotation of extend_brk is wrong. [v2: Per Stephen Hemming recommonedation made __early_alloc_p2m static] Signed-off-by: Randy Dunlap <[email protected]> Signed-off-by: Konrad Rzeszutek Wilk <[email protected]>
2011-03-29FRV: Use generic show_interrupts()Thomas Gleixner2-42/+4
Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: David Howells <[email protected]>
2011-03-29FRV: Convert genirq namespaceThomas Gleixner4-6/+7
Convert to new function names. Converted with coccinelle. Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: David Howells <[email protected]>
2011-03-29frv: Select GENERIC_HARDIRQS_NO_DEPRECATEDThomas Gleixner2-1/+3
All chips converted Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: David Howells <[email protected]>
2011-03-29frv: Convert cpu irq_chip to new functionsThomas Gleixner1-13/+13
Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: David Howells <[email protected]>
2011-03-29frv: Convert mb93493 irq_chip to new functionsThomas Gleixner1-11/+11
Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: David Howells <[email protected]>
2011-03-29frv: Convert mb93093 irq_chip to new functionThomas Gleixner1-13/+13
Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: David Howells <[email protected]>
2011-03-29frv: Convert mb93091 irq_chip to new functionsThomas Gleixner1-13/+13
Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: David Howells <[email protected]>
2011-03-29frv: Fix typo from __do_IRQ overhaulThomas Gleixner1-1/+1
Compiles way better. Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: David Howells <[email protected]>
2011-03-29frv: Remove stale irq_chip.endThomas Gleixner2-7/+0
irq_chip.end got obsolete with the removal of __do_IRQ(). irq-mb93093.c even lacks an implementation, but nobody noticed that it's broken since commit 88d6e1 in 2006. Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: David Howells <[email protected]>
2011-03-29FRV: Do some cleanupsAmerigo Wang3-10/+2
1. frv doesn't support SMP, remove the useless SMP bits. 2. frv has its own alloc_task_struct, so define __HAVE_ARCH_TASK_STRUCT_ALLOCATOR (I am not sure if frv should use generic alloc_task_struct().) Signed-off-by: WANG Cong <[email protected]> Signed-off-by: David Howells <[email protected]>
2011-03-29FRV: Missing node arg in alloc_thread_info_node() macroDavid Howells1-1/+1
There are two alloc_thread_info_node() macros defined (one for debugging and one for normal). The commit that changed them most recently: commit b6a84016bd2598e35ead635147fa53619982648d Author: Eric Dumazet <[email protected]> Date: Tue Mar 22 16:30:42 2011 -0700 Subject: mm: NUMA aware alloc_thread_info_node() didn't add the node argument into the macro argument list for the normal macro. This results in the following error: kernel/fork.c:267:39: error: macro "alloc_thread_info_node" passed 2 arguments, but takes just 1 kernel/fork.c: In function 'dup_task_struct': kernel/fork.c:267: error: 'alloc_thread_info_node' undeclared (first use in this function) kernel/fork.c:267: error: (Each undeclared identifier is reported only once kernel/fork.c:267: error: for each function it appears in.) Signed-off-by: David Howells <[email protected]>
2011-03-29NOMMU: implement access_remote_vmMike Frysinger1-13/+39
Recent vm changes brought in a new function which the core procfs code utilizes. So implement it for nommu systems too to avoid link failures. Signed-off-by: Mike Frysinger <[email protected]> Signed-off-by: David Howells <[email protected]> Tested-by: Simon Horman <[email protected]> Tested-by: Ithamar Adema <[email protected]> Acked-by: Greg Ungerer <[email protected]>
2011-03-29gpio: ab8500: Mark brokenThomas Gleixner1-1/+1
This driver is broken in several aspects. 1) old style irq_chip functions. Sigh 2) Abuse of the unlock callback. That's not supposed to be a state machine for evrything and some more. Signed-off-by: Thomas Gleixner <[email protected]>
2011-03-29genirq: Remove move_*irq leftoversThomas Gleixner2-14/+0
All users converted to new interface. Signed-off-by: Thomas Gleixner <[email protected]>
2011-03-29genirq: Remove compat codeThomas Gleixner14-452/+25
Signed-off-by: Thomas Gleixner <[email protected]>
2011-03-29drivers: Final irq namespace conversionThomas Gleixner33-69/+70
Scripted with coccinelle. Signed-off-by: Thomas Gleixner <[email protected]>
2011-03-29mn10300: Use generic show_interrupts()Thomas Gleixner2-58/+11
Signed-off-by: Thomas Gleixner <[email protected]>
2011-03-29mn10300: Cleanup irq_desc accessThomas Gleixner1-6/+5
The migration needs only access to irq_data. Signed-off-by: Thomas Gleixner <[email protected]>
2011-03-29mn10300: Convert genirq namespaceThomas Gleixner4-11/+12
Convert to new function names. Converted with coccinelle. Signed-off-by: Thomas Gleixner <[email protected]>
2011-03-29frv: Use generic show_interrupts()Thomas Gleixner2-41/+4
Signed-off-by: Thomas Gleixner <[email protected]>
2011-03-29frv: Convert genirq namespaceThomas Gleixner4-6/+7
Convert to new function names. Converted with coccinelle. Signed-off-by: Thomas Gleixner <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.