aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-03-29hwmon: twl4030-madc-hwmon: add "platform:" prefix for platform modaliasAxel Lin1-1/+1
Since 43cc71eed1250755986da4c0f9898f9a635cb3bf (platform: prefix MODALIAS with "platform:"), the platform modalias is prefixed with "platform:". Signed-off-by: Axel Lin <[email protected]> Cc: J Keerthy <[email protected]> Cc: Samuel Ortiz <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-03-29[IA64] Fix build breakage - sn_force_interrupt_flag: undefinedTony Luck1-42/+0
Latest irq changes removed the need for this forcing flag, and the definition - but missed the code that allowed it to be tweaked via /proc. Delete accessor functions too. Signed-off-by: Tony Luck <[email protected]>
2011-03-30powerpc/qe_ic: Fix another breakage from the irq_data conversionBenjamin Herrenschmidt1-8/+8
Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-03-30powerpc/8xx: Fix another breakage from the irq_data conversionBenjamin Herrenschmidt1-1/+1
Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-03-29powerpc/cell: fixup for removal of handle_iic_irqStephen Rothwell1-1/+1
Signed-off-by: Stephen Rothwell <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-03-29genirq: fix CONFIG_IRQ_EDGE_EOI_HANDLER buildStephen Rothwell1-1/+1
Fixes these errors: kernel/irq/chip.c: In function 'handle_edge_eoi_irq': kernel/irq/chip.c:517: warning: label 'out_unlock' defined but not used kernel/irq/chip.c:503: error: label 'out_eoi' used but not defined Signed-off-by: Stephen Rothwell <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-03-30powerpc/cell: Use handle_edge_eoi_irq for realThomas Gleixner1-1/+1
Missed one instance when moving that to the core code. Signed-off-by: Thomas Gleixner <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-03-30powerpc/pseries: Enable Chelsio network and iWARP driversAnton Blanchard1-0/+3
Ensure the Chelsio T3/T4 network drivers and iWARP drivers are enabled in the pseries config. Signed-off-by: Anton Blanchard <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-03-30powerpc/mm: Move the STAB0 location to 0x8000 to make room in low memoryBenjamin Herrenschmidt2-15/+15
Recent upstream builds with allmodconfig fail due to lack of space between 0x3000 and 0x6000. We have a hard block at 0x7000 but we can spare a page by moving the STAB0 from 0x6000 to 0x8000. Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-03-30powerpc: Fix accounting of softirq time when idleAnton Blanchard1-1/+1
commit cf9efce0ce31 (powerpc: Account time using timebase rather than PURR) used in_irq() to detect if the time was spent in interrupt processing. This only catches hardirq context so if we are in softirq context and in the idle loop we end up accounting it as idle time. If we instead use in_interrupt() we catch both softirq and hardirq time. The issue was found when running a network intensive workload. top showed the following: 0.0%us, 1.1%sy, 0.0%ni, 85.7%id, 0.0%wa, 9.9%hi, 3.3%si, 0.0%st 85.7% idle. But this was wildly different to the perf events data. To confirm the suspicion I ran something to keep the core busy: # yes > /dev/null & 8.2%us, 0.0%sy, 0.0%ni, 0.0%id, 0.0%wa, 10.3%hi, 81.4%si, 0.0%st We only got 8.2% of the CPU for the userspace task and softirq has shot up to 81.4%. With the patch below top shows the correct stats: 0.0%us, 0.0%sy, 0.0%ni, 5.3%id, 0.0%wa, 13.3%hi, 81.3%si, 0.0%st Signed-off-by: Anton Blanchard <[email protected]> Cc: [email protected] Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-03-30powerpc/pseries/smp: query-cpu-stopped-state support won't changeMilton Miller1-2/+2
If a given firmware doesn't have a token to support query-cpu-stopped-state, its not likely to change during the lifetime of the kernel. Only print this information once, not once per secondary thread. While here, make the line wrap grep friendly. Signed-off-by: Milton Miller <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-03-30powerpc/xics: Use hwirq for xics domain irq numberMilton Miller1-28/+29
To try to avoid future confusion, rename irq to hwirq when it refers to a xics domain number instead of a linux irq number. Signed-off-by: Milton Miller <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-03-30powerpc/xics: Fix numberspace mismatch from irq_desc conversionMilton Miller1-8/+8
commit 79f26c268ebad29bd75d078cfc09d3d82b30ccbd (powerpc: platforms/pseries irq_data conversion) pushed irq_desc down into many functions, dererencing the descriptor irq field as late as possible. But it incorrectly passed a linix virtural irq number to RTAS, resulting in the interrupt not being disabled and possibly other bad things, such as another interrupt being disabled and/or a checkstop. In addition this missed the point of xics_mask_unknown_vec and the seperation of xics_mask_real_irq from xics_mask_irq. When xics_mask_unknown_vec is called it's because the hardware delivered an irq source for which we have no linux irq allocated, and thefore we can not have an irq_desc allocated. Revert xics_mask_real_irq to its prior version, naming the argument hwirq to highlight the difference. Signed-off-by: Milton Miller <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-03-30powerpc: Wire up new syscallsStephen Rothwell2-1/+9
These syscalls have been added recently: name_to_handle_at open_by_handle_at clock_adjtime syncfs Signed-off-by: Stephen Rothwell <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-03-30powerpc/booke: Correct the SPRN_MAS5 definition.Varun Sethi1-1/+1
339 is the SPR number for MAS5 documented by Power ISA 2.06, and implemented by e500mc. It is not yet used anywhere in the kernel, so nothing should be relying on the wrong number. Signed-off-by: Varun Sethi <[email protected]> Signed-off-by: Scott Wood <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-03-30powerpc: ARCH_PFN_OFFSET should be unsigned longScott Wood1-1/+1
pfns are unsigned long, but MEMORY_START is phys_addr_t. This leads to page_to_pfn() returning phys_addr_t, and thus type mismatches in a few print statements. Signed-off-by: Scott Wood <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
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-30ASoC: Fix CODEC device name for CorgiMark Brown1-1/+1
Got typoed in the multi-component changes. Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]> Cc: [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]>
Powered by cgit, Gruvboxed by Blaster4385.