aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-12-09x86, apic: Use register_lapic_address() in init_apic_mapping()Yinghai Lu1-4/+1
Remove the printk as well, we don't want to print when nothing changed. We print in register_lapic_address() already. Signed-off-by: Yinghai Lu <[email protected]> Cc: Suresh Siddha <[email protected]> Cc: "Eric W. Biederman" <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]>
2010-12-09x86, apic: Remove early_init_lapic_mapping()Yinghai Lu4-30/+4
It is almost the same as smp_register_lapic_addr(). We just need to let smp_read_mpc() call smp_register_lapic_addr() when early==1. Add the apic_printk to smp_register_lapic_address() Signed-off-by: Yinghai Lu <[email protected]> Cc: Suresh Siddha <[email protected]> Cc: "Eric W. Biederman" <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]>
2010-12-09x86, apic: Unify identical register_lapic_address() functionsYinghai Lu4-27/+16
They are the same, move the common function to apic.c to allow further cleanups. Signed-off-by: Yinghai Lu <[email protected]> Cc: Suresh Siddha <[email protected]> Cc: "Eric W. Biederman" <[email protected]> Cc: Len Brown <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]>
2010-12-09Merge branch 'x86/platform' into x86/apic-cleanupsThomas Gleixner28-18/+1934
Reason: apic cleanup series depends on x86/apic, x86/amd-nb and x86/platform Signed-off-by: Thomas Gleixner <[email protected]>
2010-12-09Merge branch 'x86/amd-nb' into x86/apic-cleanupsThomas Gleixner8833-471973/+917649
Reason: apic cleanup series depends on x86/apic, x86/amd-nb x86/platform Conflicts: arch/x86/include/asm/io_apic.h Signed-off-by: Thomas Gleixner <[email protected]>
2010-12-06x86, earlyprintk: Move mrst early console to platform/ and fix a typoFeng Tang4-3/+2
Move the code to arch/x86/platform/mrst/. Also fix a typo to use the correct config option: ONFIG_EARLY_PRINTK_MRST Signed-off-by: Feng Tang <[email protected]> Cc: [email protected] LKML-Reference: <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]>
2010-12-06x86, apbt: Setup affinity for apb timers acting as per-cpu timerFeng Tang1-0/+1
Commit a5ef2e70 "x86: Sanitize apb timer interrupt handling" forgot the affinity setup when cleaning up the code, this patch just adds the forgotten part Signed-off-by: Feng Tang <[email protected]> Cc: Jacob Pan <[email protected]> Cc: Alan Cox <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]>
2010-12-06ce4100: Add errata fixes for UART on CE4100Dirk Brandewie1-2/+92
This patch enables the UART on the CE4100. The UART has a couple of issues that need to be worked around. First the UART is mostly PC compatible except that it is clocked eight times faster than a standard PC so the default configuration provided in arch/x86/include/asm/serial.h needs to be overridden. Second the TX interrupt may not be set correctly all the time. Lastly accessing the UART via I/O space for early_prink() hangs the chip when the IOAPIC is enabled. A custom mem_serial_in() is provided to work around the TX interrupt issue. The configuration issues are dealt with in the call back registered with the 8250 driver via serial8250_set_isa_configurator() Signed-off-by: Dirk Brandewie <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]>
2010-12-06x86: io_apic: Split setup_ioapic_ids_from_mpc()Sebastian Andrzej Siewior2-12/+17
Sodaville needs to setup the IO_APIC ids as the boot loader leaves them uninitialized. Split out the setter function so it can be called unconditionally from the sodaville board code. Signed-off-by: Sebastian Andrzej Siewior <[email protected]> Cc: Yinghai Lu <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]>
2010-11-20x86: platform: Move iris to x86/platform where it belongsThomas Gleixner4-1/+2
Signed-off-by: Thomas Gleixner <[email protected]>
2010-11-18x86, mrst: Check platform_device_register() return codeVasiliy Kulikov1-2/+1
platform_device_register() may fail, if so propagate the return code from mrst_device_create(). Signed-off-by: Vasiliy Kulikov <[email protected]> LKML-Reference: <[email protected]> Acked-by: Alan Cox <[email protected]> Signed-off-by: H. Peter Anvin <[email protected]>
2010-11-18x86, cacheinfo: Cleanup L3 cache index disable supportHans Rosenfeld3-84/+74
Adaptions to the changes of the AMD northbridge caching code: instead of a bool in each l3 struct, use a flag in amd_northbridges.flags to indicate L3 cache index disable support; use a pointer to the whole northbridge instead of the misc device in the l3 struct; simplify the initialisation; dynamically generate sysfs attribute array. Signed-off-by: Hans Rosenfeld <[email protected]> Signed-off-by: Borislav Petkov <[email protected]>
2010-11-18x86, amd-nb: Cleanup AMD northbridge caching codeHans Rosenfeld6-88/+118
Support more than just the "Misc Control" part of the northbridges. Support more flags by turning "gart_supported" into a single bit flag that is stored in a flags member. Clean up related code by using a set of functions (amd_nb_num(), amd_nb_has_feature() and node_to_amd_nb()) instead of accessing the NB data structures directly. Reorder the initialization code and put the GART flush words caching in a separate function. Signed-off-by: Hans Rosenfeld <[email protected]> Signed-off-by: Borislav Petkov <[email protected]>
2010-11-18x86, amd-nb: Complete the rename of AMD NB and related codeHans Rosenfeld12-119/+119
Not only the naming of the files was confusing, it was even more so for the function and variable names. Renamed the K8 NB and NUMA stuff that is also used on other AMD platforms. This also renames the CONFIG_K8_NUMA option to CONFIG_AMD_NUMA and the related file k8topology_64.c to amdtopology_64.c. No functional changes intended. Signed-off-by: Hans Rosenfeld <[email protected]> Signed-off-by: Borislav Petkov <[email protected]>
2010-11-18x86/platform: Add Eurobraille/Iris power off supportShérab3-0/+105
The Iris machines from Eurobraille do not have APM or ACPI support to shut themselves down properly. A special I/O sequence is needed to do so. This modle runs this I/O sequence at kernel shutdown when its force parameter is set to 1. Signed-off-by: Shérab <[email protected]> Acked-by: "H. Peter Anvin" <[email protected]> [ did minor coding style edits ] Signed-off-by: Ingo Molnar <[email protected]>
2010-11-17x86, mrst: Add explanation for using 1960 as the year offset for vrtcFeng Tang1-1/+5
Explain the reason for the apparently odd choice of year offset so we don't get more questions about it. Signed-off-by: Feng Tang <[email protected]> Signed-off-by: Alan Cox <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]>
2010-11-17x86, mrst: Fix dependencies of "select INTEL_SCU_IPC"Randy Dunlap1-0/+1
commit b9fc71f47 (x86, mrst: The shutdown for MRST requires the SCU IPC mechanism) introduced the following warning: warning: (X86_MRST && PCI && PCI_GOANY && X86_32 && X86_EXTENDED_PLATFORM && X86_IO_APIC) selects INTEL_SCU_IPC which has unmet direct dependencies (X86 && X86_PLATFORM_DEVICES && X86_MRST) which is due to the hierarchical menu structure. Select X86_PLATFORM_DEVICES as well. Originally-from: Randy Dunlap <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> LKML-Reference: <[email protected]> Cc: Alan Cox <[email protected]>
2010-11-17x86, mrst: The shutdown for MRST requires the SCU IPC mechanismAlan Cox1-0/+1
Fix the build failure reported by Randy. Reported-by: Randy Dunlap <[email protected]> Signed-off-by: Alan Cox <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]>
2010-11-15Linux 2.6.37-rc2Linus Torvalds1-1/+1
2010-11-15capabilities/syslog: open code cap_syslog logic to fix build failureEric Paris7-40/+28
The addition of CONFIG_SECURITY_DMESG_RESTRICT resulted in a build failure when CONFIG_PRINTK=n. This is because the capabilities code which used the new option was built even though the variable in question didn't exist. The patch here fixes this by moving the capabilities checks out of the LSM and into the caller. All (known) LSMs should have been calling the capabilities hook already so it actually makes the code organization better to eliminate the hook altogether. Signed-off-by: Eric Paris <[email protected]> Acked-by: James Morris <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-11-15Merge branch 'omap-fixes-for-linus' of ↵Linus Torvalds4-6/+6
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: arm: omap1: devices: need to return with a value OMAP1: camera.h: add missing include omap: dma: Add read-back to DMA interrupt handler to avoid spuriousinterrupts OMAP2: Devkit8000: Fix mmc regulator failure
2010-11-15Merge branch 'hwmon-for-linus' of ↵Linus Torvalds5-42/+192
git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: hwmon: (w83795) Check for BEEP pin availability hwmon: (w83795) Clear intrusion alarm immediately hwmon: (w83795) Read the intrusion state properly hwmon: (w83795) Print the actual temperature channels as sources hwmon: (w83795) List all usable temperature sources hwmon: (w83795) Expose fan control method hwmon: (w83795) Fix fan control mode attributes hwmon: (lm95241) Check validity of input values hwmon: Change mail address of Hans J. Koch
2010-11-15Merge branch 'i2c-for-linus' of ↵Linus Torvalds12-36/+23
git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: i2c: Sanity checks on adapter registration i2c: Mark i2c_adapter.id as deprecated i2c: Drivers shouldn't include <linux/i2c-id.h> i2c: Delete unused adapter IDs i2c: Remove obsolete cleanup for clientdata
2010-11-15Merge branch 'for-linus' of ↵Linus Torvalds7-49/+174
git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: PCI: sysfs: fix printk warnings PCI: fix pci_bus_alloc_resource() hang, prefer positive decode PCI: read current power state at enable time PCI: fix size checks for mmap() on /proc/bus/pci files x86/PCI: coalesce overlapping host bridge windows PCI hotplug: ibmphp: Add check to prevent reading beyond mapped area
2010-11-15i2c: Sanity checks on adapter registrationJean Delvare1-0/+12
Make sure I2C adapters being registered have the required struct fields set. If they don't, problems will happen later. Signed-off-by: Jean Delvare <[email protected]>
2010-11-15i2c: Mark i2c_adapter.id as deprecatedJean Delvare3-2/+11
It's about time to make it clear that i2c_adapter.id is deprecated. Hopefully this will remind the last user to move over to a different strategy. Signed-off-by: Jean Delvare <[email protected]> Acked-by: Jarod Wilson <[email protected]> Acked-by: Mauro Carvalho Chehab <[email protected]> Acked-by: Hans Verkuil <[email protected]>
2010-11-15i2c: Drivers shouldn't include <linux/i2c-id.h>Jean Delvare3-3/+0
Drivers don't need to include <linux/i2c-id.h>, especially not when they don't use anything that header file provides. Signed-off-by: Jean Delvare <[email protected]> Cc: Michael Hunold <[email protected]> Acked-by: Mauro Carvalho Chehab <[email protected]>
2010-11-15i2c: Delete unused adapter IDsJean Delvare2-23/+0
Delete unused I2C adapter IDs. Special cases are: * I2C_HW_B_RIVA was still set in driver rivafb, however no other driver is ever looking for this value, so we can safely remove it. * I2C_HW_B_HDPVR is used in staging driver lirc_zilog, however no adapter ID is ever set to this value, so the code in question never runs. As the code additionally expects that I2C_HW_B_HDPVR may not be defined, we can delete it now and let the lirc_zilog driver maintainer rewrite this piece of code. Big thanks for Hans Verkuil for doing all the hard work :) Signed-off-by: Jean Delvare <[email protected]> Acked-by: Jarod Wilson <[email protected]> Acked-by: Mauro Carvalho Chehab <[email protected]> Acked-by: Hans Verkuil <[email protected]>
2010-11-15i2c: Remove obsolete cleanup for clientdataWolfram Sang4-8/+0
A few new i2c-drivers came into the kernel which clear the clientdata-pointer on exit. This is obsolete meanwhile, so fix it and hope the word will spread. Signed-off-by: Wolfram Sang <[email protected]> Acked-by: Alan Cox <[email protected]> Acked-by: Guennadi Liakhovetski <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2010-11-15include/linux/kernel.h: Move logging bits to include/linux/printk.hLinus Torvalds2-244/+249
Move the logging bits from kernel.h into printk.h so that there is a bit more logical separation of the generic from the printk logging specific parts. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-11-15Fix gcc 4.5.1 miscompiling drivers/char/i8k.c (again)Jim Bos1-4/+4
The fix in commit 6b4e81db2552 ("i8k: Tell gcc that *regs gets clobbered") to work around the gcc miscompiling i8k.c to add "+m (*regs)" caused register pressure problems and a build failure. Changing the 'asm' statement to 'asm volatile' instead should prevent that and works around the gcc bug as well, so we can remove the "+m". [ Background on the gcc bug: a memory clobber fails to mark the function the asm resides in as non-pure (aka "__attribute__((const))"), so if the function does nothing else that triggers the non-pure logic, gcc will think that that function has no side effects at all. As a result, callers will be mis-compiled. Adding the "+m" made gcc see that it's not a pure function, and so does "asm volatile". The problem was never really the need to mark "*regs" as changed, since the memory clobber did that part - the problem was just a bug in the gcc "pure" function analysis - Linus ] Signed-off-by: Jim Bos <[email protected]> Acked-by: Jakub Jelinek <[email protected]> Cc: Andi Kleen <[email protected]> Cc: Andreas Schwab <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-11-15hwmon: (w83795) Check for BEEP pin availabilityJean Delvare1-7/+51
On the W83795ADG, there's a single pin for BEEP and OVT#, so you can't have both. Check the configuration and don't create beep attributes when BEEP pin is not available. The W83795G has a dedicated BEEP pin so the functionality is always available there. Signed-off-by: Jean Delvare <[email protected]> Acked-by: Guenter Roeck <[email protected]>
2010-11-15hwmon: (w83795) Clear intrusion alarm immediatelyJean Delvare1-0/+4
When asked to clear the intrusion alarm, do so immediately. We have to invalidate the cache to make sure the new status will be read. But we also have to read from the status register once to clear the pending alarm, as writing to CLR_CHS surprising won't clear it automatically. Signed-off-by: Jean Delvare <[email protected]> Acked-by: Guenter Roeck <[email protected]>
2010-11-15hwmon: (w83795) Read the intrusion state properlyJean Delvare1-3/+20
We can't read the intrusion state from the real-time alarm registers as we do for all other alarm flags, because real-time alarm bits don't stick (by definition) and the intrusion state has to stick until explicitly cleared (otherwise it has little value.) So we have to use the interrupt status register instead, which is read from the same address but with a configuration bit flipped in another register. Signed-off-by: Jean Delvare <[email protected]> Acked-by: Guenter Roeck <[email protected]>
2010-11-15hwmon: (w83795) Print the actual temperature channels as sourcesJean Delvare1-10/+20
Don't expose raw register values to user-space. Decode and encode temperature channels selected as temperature sources as needed. Signed-off-by: Jean Delvare <[email protected]> Acked-by: Guenter Roeck <[email protected]>
2010-11-15hwmon: (w83795) List all usable temperature sourcesJean Delvare1-3/+54
Temperature sources are not correlated directly with temperature channels. A look-up table is required to find out which temperature sources can be used depending on which temperature channels (both analog and digital) are enabled. Signed-off-by: Jean Delvare <[email protected]> Acked-by: Guenter Roeck <[email protected]>
2010-11-15hwmon: (w83795) Expose fan control methodJean Delvare1-1/+18
Expose fan control method (DC vs. PWM) using the standard sysfs attributes. I've made it read-only as the board should be wired for a given mode, the BIOS should have set up the chip for this mode, and you shouldn't have to change it. But it would be easy enough to make it changeable if someone comes up with a use case. Signed-off-by: Jean Delvare <[email protected]> Acked-by: Guenter Roeck <[email protected]>
2010-11-15hwmon: (w83795) Fix fan control mode attributesJean Delvare1-10/+8
There were two bugs: * Speed cruise mode was improperly reported for all fans but fan1. * Fan control method (PWM vs. DC) was mixed with the control mode. It will be added back as a separate attribute, as per the standard sysfs interface. Signed-off-by: Jean Delvare <[email protected]> Acked-by: Guenter Roeck <[email protected]>
2010-11-15hwmon: (lm95241) Check validity of input valuesJean Delvare1-5/+14
This clears the following build-time warnings I was seeing: drivers/hwmon/lm95241.c: In function "set_interval": drivers/hwmon/lm95241.c:132:15: warning: ignoring return value of "strict_strtol", declared with attribute warn_unused_result drivers/hwmon/lm95241.c: In function "set_max2": drivers/hwmon/lm95241.c:278:1: warning: ignoring return value of "strict_strtol", declared with attribute warn_unused_result drivers/hwmon/lm95241.c: In function "set_max1": drivers/hwmon/lm95241.c:277:1: warning: ignoring return value of "strict_strtol", declared with attribute warn_unused_result drivers/hwmon/lm95241.c: In function "set_min2": drivers/hwmon/lm95241.c:249:1: warning: ignoring return value of "strict_strtol", declared with attribute warn_unused_result drivers/hwmon/lm95241.c: In function "set_min1": drivers/hwmon/lm95241.c:248:1: warning: ignoring return value of "strict_strtol", declared with attribute warn_unused_result drivers/hwmon/lm95241.c: In function "set_type2": drivers/hwmon/lm95241.c:220:1: warning: ignoring return value of "strict_strtol", declared with attribute warn_unused_result drivers/hwmon/lm95241.c: In function "set_type1": drivers/hwmon/lm95241.c:219:1: warning: ignoring return value of "strict_strtol", declared with attribute warn_unused_result This also fixes a small race in set_interval() as a side effect: by working with a temporary local variable we prevent data->interval from being accessed at a time it contains the interval value in the wrong unit. Signed-off-by: Jean Delvare <[email protected]> Cc: Davide Rizzo <[email protected]>
2010-11-15hwmon: Change mail address of Hans J. KochHans J. Koch3-4/+4
My old mail address doesn't exist anymore. This changes all occurrences to my new address. Signed-off-by: Hans J. Koch <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2010-11-15PCI: sysfs: fix printk warningsRandy Dunlap1-1/+2
Cast pci_resource_start() and pci_resource_len() to u64 for printk. drivers/pci/pci-sysfs.c:753: warning: format '%16Lx' expects type 'long long unsigned int', but argument 9 has type 'resource_size_t' drivers/pci/pci-sysfs.c:753: warning: format '%16Lx' expects type 'long long unsigned int', but argument 10 has type 'resource_size_t' Signed-off-by: Randy Dunlap <[email protected]> Signed-off-by: Jesse Barnes <[email protected]>
2010-11-15Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixesLinus Torvalds5-216/+98
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes: GFS2: Fix inode deallocation race
2010-11-15Merge branch 's5p-fixes-for-linus' of ↵Linus Torvalds2-17/+17
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung * 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: SAMSUNG: Fix HAVE_S3C_RTC warnings ARM: SAMSUNG: Fix HAVE_S3C2410_I2C warnings ARM: SAMSUNG: Fix HAVE_S3C2410_WATCHDOG warnings
2010-11-15Merge branch 'fbdev-fixes-for-linus' of ↵Linus Torvalds7-20/+40
git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6 * 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6: fsl-diu-fb: drop dead ioctl define MAINTAINERS: Add an fbdev git tree entry. OMAP: DSS: Fix documentation regarding 'vram' kernel parameter OMAP: VRAM: Fix boot-time memory allocation OMAP: VRAM: improve VRAM error prints sisfb: limit POST memory test according to PCI resource length fbdev: sh_mobile_lcdc: use correct number of modes, when using the default fbdev: sh_mobile_lcdc: use the standard CEA-861 720p timing fbdev: sh_mobile_hdmi: properly clean up modedb on monitor unplug
2010-11-15Merge branches 'sh-fixes-for-linus' and 'rmobile-fixes-for-linus' of ↵Linus Torvalds7-9/+15
git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: intc: Fix up build failure introduced by radix tree changes. MAINTAINERS: update the sh git tree entry. sh: clkfwk: fix up compiler warnings. sh: intc: Fix up initializers for gcc 4.5. rtc: rtc-sh - fix a memory leak * 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: ARM: mach-shmobile: ap4evb: add fsib 44100Hz rate MAINTAINERS: update the ARM SH-Mobile git tree entry. ARM: mach-shmobile: ap4evb: Mark NOR boot loader partitions read-only. ARM: mach-shmobile: intc-sh7372: fix interrupt number
2010-11-15GFS2: Fix inode deallocation raceSteven Whitehouse5-216/+98
This area of the code has always been a bit delicate due to the subtleties of lock ordering. The problem is that for "normal" alloc/dealloc, we always grab the inode locks first and the rgrp lock later. In order to ensure no races in looking up the unlinked, but still allocated inodes, we need to hold the rgrp lock when we do the lookup, which means that we can't take the inode glock. The solution is to borrow the technique already used by NFS to solve what is essentially the same problem (given an inode number, look up the inode carefully, checking that it really is in the expected state). We cannot do that directly from the allocation code (lock ordering again) so we give the job to the pre-existing delete workqueue and carry on with the allocation as normal. If we find there is no space, we do a journal flush (required anyway if space from a deallocation is to be released) which should block against the pending deallocations, so we should always get the space back. Signed-off-by: Steven Whitehouse <[email protected]>
2010-11-15Merge branch 'rmobile/core' into rmobile-fixes-for-linusPaul Mundt1-0/+4
2010-11-15ARM: mach-shmobile: ap4evb: add fsib 44100Hz rateKuninori Morimoto1-0/+4
Tested-by: Tony SIM <[email protected]> Tested-by: TAKEI Mitsuharu <[email protected]> Signed-off-by: Kuninori Morimoto <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2010-11-15sh: intc: Fix up build failure introduced by radix tree changes.Paul Mundt1-1/+1
The radix tree retry logic got a bit of an overhaul and subsequently broke the virtual IRQ subgroup build. Simply switch over to radix_tree_deref_retry() as per the filemap changes, which the virq lookup logic was modelled after in the first place. Signed-off-by: Paul Mundt <[email protected]>
2010-11-15Merge branch 'master' of ↵Paul Mundt425-2902/+9108
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/urgent