aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-06-02of/crypto: crypto4xx_core.c: fix build breakageAnatolij Gustschin1-3/+3
Fixes build error caused by the OF device_node pointer being moved into struct device Signed-off-by: Anatolij Gustschin <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2010-06-02of/dma: fix build breakage in ppc4xx adma driverAnatolij Gustschin1-2/+2
Fixes build error caused by the OF device_node pointer being moved into struct device Signed-off-by: Anatolij Gustschin <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2010-06-02of/mtd: nand: fix build breakage in driversAnatolij Gustschin2-10/+11
Fixes build errors in drivers caused by the OF device_node pointer being moved into struct device Signed-off-by: Anatolij Gustschin <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2010-06-02of/video: fix build breakage in FB driversAnatolij Gustschin7-7/+7
Fixes build errors in a number of framebuffer drivers caused by the OF device_node pointer being moved into struct device Signed-off-by: Anatolij Gustschin <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2010-06-02of/pcmcia: m8xx_pcmcia.c: Fix build failuresAnatolij Gustschin1-2/+2
Fixes build errors caused by the: - OF device_node pointer being moved into struct device - typo in match_table field in the struct device_driver (which shoud be of_match_table) Signed-off-by: Anatolij Gustschin <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2010-06-02Fix colors for Mach64Mikulas Patocka1-3/+6
Use the same color-calculating algorithm as in atyfb_imageblit in this driver or in generic cfb_fillrect. This patch fixes bad colors when using an accelerator in 15-bit and 16-bit modes. Signed-off-by: Mikulas Patocka <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-06-02of/rtc: rtc-mpc5121.c: Fix build failuresGrant Likely1-6/+8
Fixes build errors caused by the: - OF device_node pointer being moved into struct device - removal of the match_table field from struct of_platform_driver Signed-off-by: Grant Likely <[email protected]> CC: Paul Gortmaker <[email protected]> CC: Alessandro Zummo <[email protected]> CC: Wolfgang Denk <[email protected]> CC: Tejun Heo <[email protected]> CC: Anatolij Gustschin <[email protected]> CC: [email protected] CC: [email protected]
2010-06-02of/dma: mpc512x_dma.c: Fix build failuresAnatolij Gustschin1-5/+5
Fixes build errors caused by the: - OF device_node pointer being moved into struct device - removal of the match_table field from struct of_platform_driver Signed-off-by: Anatolij Gustschin <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2010-06-02of/mtd/nand: mpc5121_nfc.c: Fix build failuresAnatolij Gustschin1-4/+4
Fixes build errors caused by the: - OF device_node pointer being moved into struct device - removal of the match_table field from struct of_platform_driver Signed-off-by: Anatolij Gustschin <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2010-06-02of/spi: mpc512x_psc_spi.c: Fix build failuresAnatolij Gustschin1-6/+6
Fixes build errors caused by the: - OF device_node pointer being moved into struct device - removal of the match_table field from struct of_platform_driver Signed-off-by: Anatolij Gustschin <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2010-06-02watchdog: Fix build failure with OF changesMichael Guntsche1-1/+1
commit 61c7a080a5a061c976988fd4b844dfb468dda255 ( of: Always use 'struct device.of_node' to get device node pointer.) missed drivers/watchdog/mpc8xxx_wdt.c. This patch fixes it Signed-off-by: Michael Guntsche <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2010-06-02of/spi: Fix build failure on spi_ppc4xx.cGrant Likely1-1/+1
This patch fixes a build error caused by the OF device_node pointer being moved into struct device. Fixes bug introduced by commit 61c7a080a5a061c976988fd4b844dfb468dda255 (of: Always use 'struct device.of_node' to get device node pointer) Signed-off-by: Grant Likely <[email protected]> CC: Sean MacLennan <[email protected]> CC: [email protected] CC: [email protected]
2010-06-02of/usb: fix build error due to of_node pointer moveGrant Likely1-1/+1
Fix driver to use new location of of_node pointer (introduced by commit use new location of of_node pointer (introduced by commit 61c7a080a5a061c976988fd4b844dfb468dda255; of: Always use 'struct device.of_node' to get device node pointer) Signed-off-by: Grant Likely <[email protected]> Reported-by: John Linn <[email protected]> CC: Greg Kroah-Hartman <[email protected]> CC: Alan Stern <[email protected]> CC: [email protected] CC: [email protected]
2010-06-02libata: implement on-demand HPA unlockingTejun Heo3-0/+32
Implement ata_scsi_unlock_native_capacity() which will be called through SCSI layer when block layer notices that partitions on a device extend beyond the end of the device. It requests EH to unlock HPA, waits for completion and returns the current device capacity. This allows libata to unlock HPA on demand instead of having to decide whether to unlock upfront. Unlocking on demand is safer than unlocking by upfront because some BIOSes write private data to the area beyond HPA limit. This was suggested by Ben Hutchings. Signed-off-by: Tejun Heo <[email protected]> Suggested-by: Ben Hutchings <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2010-06-02libata: use the enlarged capacity after late HPA unlockTejun Heo1-3/+2
After late HPA unlock, libata kept using the original capacity ignoring the new larger native capacity. Enlarging device on the fly doesn't cause any harm. Use the larger native capacity instead. This will enable on-demand HPA unlocking. Signed-off-by: Tejun Heo <[email protected]> Cc: Ben Hutchings <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2010-06-02SCSI: implement sd_unlock_native_capacity()Tejun Heo2-0/+30
Implement sd_unlock_native_capacity() method which calls into hostt->unlock_native_capacity() if implemented. This will be invoked by block layer if partitions extend beyond the end of the device and can be used to implement, for example, on-demand ATA host protected area unlocking. Signed-off-by: Tejun Heo <[email protected]> Cc: Ben Hutchings <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2010-06-02libata-sff: trivial corrections to Kconfig help textStefan Richter1-3/+3
Signed-off-by: Stefan Richter <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2010-06-02sata_nv: don't diddle with nIEN on mcp55Tejun Heo1-2/+0
On mcp55, nIEN gets stuck once set and liteon blueray rom iHOS104-08 violates ATA specification and fails to set I on D2H Reg FIS if nIEN is set when the command was issued. When the other party is following the spec, both devices can work fine but when the two flaws are put together, they can't talk to each other. mcp55 has its own IRQ masking mechanism and there's no reason to mess with nIEN in the first place. Fix it by dropping nIEN diddling from nv_mcp55_freeze/thaw(). This was originally reported by Cengiz. Although Cengiz hasn't verified the fix yet, I could reproduce this problem and verfiy the fix. Even if Cengiz is experiencing different or additional problems, this patch is needed. Signed-off-by: Tejun Heo <[email protected]> Reported-by: Cengiz Günay <[email protected]> Cc: [email protected] Signed-off-by: Jeff Garzik <[email protected]>
2010-06-02sata_via: magic vt6421 fix for transmission problems w/ WD drivesTejun Heo1-0/+13
vt6421 has problems talking to recent WD drives. It causes a lot of transmission errors while high bandwidth transfer as reported in the following bugzilla entry. https://bugzilla.kernel.org/show_bug.cgi?id=15173 Joseph Chan provided the following fix. I don't have any idea what it does but I can verify the issue is gone with the patch applied. Signed-off-by: Tejun Heo <[email protected]> Originally-from: Joseph Chan <[email protected]> Reported-by: Jorrit Tijben <[email protected]> Cc: [email protected] Signed-off-by: Jeff Garzik <[email protected]>
2010-06-02Merge branch 'fix/asoc' into for-linusTakashi Iwai1-1/+10
2010-06-02Merge branch 'fix/hda' into for-linusTakashi Iwai211-2101/+9618
2010-06-02Merge branch 'for-2.6.35' of ↵Takashi Iwai1-1/+10
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc
2010-06-02Merge branch 'master' of git.alsa-project.org:alsa-kernel into fix/hdaTakashi Iwai211-2101/+9618
2010-06-02ALSA: hda-intel - fix wallclk variable update and conditionJaroslav Kysela1-2/+2
This patch fixes thinko introduced in "last minutes" before commiting of the last wallclk patch. It also fixes the condition checking if the first period after last wallclk update is processed. There is a little rounding error in period_wallclk. Signed-off-by: Jaroslav Kysela <[email protected]>
2010-06-02Merge branch 'fix/hda' into for-linusTakashi Iwai2-0/+4
2010-06-02ALSA: asihpi - Fix uninitialized variableTakashi Iwai1-0/+3
Initialize prev_ctl properly before reference: sound/pci/asihpi/asihpi.c: In function ‘snd_card_asihpi_mixer_new’: sound/pci/asihpi/asihpi.c:2568:30: warning: ‘prev_ctl.dst_node_index’ may be used uninitialized in this function Signed-off-by: Takashi Iwai <[email protected]>
2010-06-02powerpc/macio: Fix probing of macio devices by using the right of match tableBenjamin Herrenschmidt14-34/+58
Grant patches added an of mach table to struct device_driver. However, while he changed the macio device code to use that, he left the match table pointer in struct macio_driver and didn't update drivers to use the "new" one, thus breaking the probing. This completes the change by moving all drivers to setup the "new" one, removing all traces of the old one, and while at it (since it changes the exact same locations), I also remove two other duplicates from struct driver which are the name and owner fields. Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-06-02agp/uninorth: Fix oops caused by flushing too muchPaul Mackerras1-1/+1
This fixes a sporadic oops at boot on G5 Power Macs. The table_end variable has the address of the last byte of the table. Adding on PAGE_SIZE means we flush too much, and if the page after the table is not mapped for any reason, the kernel will oops. Instead we add on 1 because flush_dcache_range() interprets its second argument as the first byte past the range to be flushed. Signed-off-by: Paul Mackerras <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-06-02powerpc/pasemi: Update MAINTAINERS fileOlof Johansson1-2/+1
PWRficient platform work is definitely in maintenance mode these days, update MAINTAINERS file to reflect reality. Website is long gone as well. Signed-off-by: Olof Johansson <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-06-02powerpc/cell: Fix integer constant warningDenis Kirjanov1-1/+1
Fix smatch warning: warning: constant 0x800000000 is so big it is long Signed-off-by: Denis Kirjanov <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-06-02powerpc/kprobes: Remove resume_execution() in kprobesAnanth N Mavinakayanahalli1-12/+2
emulate_step() in kprobe_handler() would've already determined if the probed instruction can be emulated. We single-step in hardware only if the instruction couldn't be emulated. resume_execution() therefore is superfluous -- all we need is to fix up the instruction pointer after single-stepping. Thanks to Paul Mackerras for catching this. Signed-off-by: Ananth N Mavinakayanahalli <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-06-02powerpc/macio: Don't dereference pointer before null checkAndreas Schwab1-3/+4
Signed-off-by: Andreas Schwab <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-06-02of/powerpc: fix 85xx RapidIO device node pointerAlexandre Bounine1-1/+1
Fixes bug introduced by commit 61c7a080a5a061c976988fd4b844dfb468dda255 (of: Always use 'struct device.of_node' to get device node pointer) Signed-off-by: Alexandre Bounine <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2010-06-02x86, smpboot: Fix cores per node printing on bootBorislav Petkov1-1/+1
Percpu initialization happens now after booting the cores on the machine and this causes them all to be displayed as belonging to node 0: Jun 8 05:57:21 kepek kernel: [ 0.106999] Booting Node 0, Processors #1 #2 #3 #4 #5 #6 #7 #8 #9 #10 #11 #12 #13 #14 #15 #16 #17 #18 #19 #20 #21 #22 #23 Ok. Use early_cpu_to_node() to get the correct node of each core instead. Signed-off-by: Borislav Petkov <[email protected]> Cc: Mike Travis <[email protected]> LKML-Reference: <20100601190455.GA14237@aftab> Signed-off-by: Ingo Molnar <[email protected]>
2010-06-02Merge branch 'perf/urgent' of ↵Ingo Molnar4-20/+39
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/urgent
2010-06-01Merge branches 'bugzilla-14668' and 'misc-2.6.35' into releaseLen Brown7853-241366/+580828
2010-06-01Merge branch 'next' of ↵Linus Torvalds29-258/+3712
git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: Don't export cvt_fd & _df when CONFIG_PPC_FPU is not set powerpc/44x: icon: select SM502 and frame buffer console support powerpc/85xx: Add P1021MDS board support powerpc/85xx: Change MPC8572DS camp dtses for MSI sharing powerpc/fsl_msi: add removal path and probe failing path powerpc/fsl_msi: enable msi sharing through AMP OSes powerpc/fsl_msi: enable msi allocation in all banks powerpc/fsl_msi: fix the conflict of virt_msir's chip_data powerpc/fsl_msi: Add multiple MSI bank support powerpc/kexec: Add support for FSL-BookE powerpc/fsl-booke: Move the entry setup code into a seperate file powerpc/fsl-booke: fix the case where we are not in the first page powerpc/85xx: Enable support for ports 3 and 4 on 8548 CDS powerpc/fsl-booke: Add hibernation support for FSL BookE processors powerpc/e500mc: Implement machine check handler. powerpc/44x: Add basic ICON PPC440SPe board support powerpc/44x: Fix UART clocks on 440SPe powerpc/44x: Add reset-type to katmai.dts powerpc/44x: Adding PCI-E support for PowerPC 460SX based SOC.
2010-06-01Merge branch 'drm-intel-next' of ↵Linus Torvalds21-1082/+2590
git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel * 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel: (41 commits) drm/i915: add HAS_BSD check to i915_getparam drm/i915: Honor sync polarity from VBT panel timing descriptors drm/i915: Unmask interrupt for render engine on Sandybridge drm/i915: Fix PIPE_CONTROL command on Sandybridge drm/i915: Fix up address spaces in slow_kernel_write() drm/i915: Use non-atomic kmap for slow copy paths drm/i915: Avoid moving from CPU domain during pwrite drm/i915: Cleanup after failed initialization of ringbuffers drm/i915: Reject bind_to_gtt() early if object > aperture drm/i915: Check error code whilst moving buffer to GTT domain. drm/i915: Remove spurious warning "Failure to install fence" drm/i915: Rebind bo if currently bound with incorrect alignment. drm/i915: Include pitch in set_base debug statement. drm/i915: Only print "nothing to do" debug message as required. drm/i915: Propagate error from unbinding an unfenceable object. drm/i915: Avoid nesting of domain changes when setting display plane drm/i915: Hold the spinlock whilst resetting unpin_work along error path drm/i915: Only print an message if there was an error drm/i915: Clean up leftover bits from hws move to ring structure. drm/i915: Add CxSR support on Pineview DDR3 ...
2010-06-01FS-Cache: Remove unneeded null checksDan Carpenter1-20/+16
fscache_write_op() makes unnecessary checks of the page variable to see if it is NULL. It can't be NULL at those points as the kernel would already have crashed a little higher up where we examined page->index. Furthermore, unless radix_tree_gang_lookup_tag() can return 1 but no page, a NULL pointer crash should not be encountered there as we can only get there if r_t_g_l_t() returned 1. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: David Howells <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-06-01perf buildid-list: Fix --with-hits event processingArnaldo Carvalho de Melo1-1/+3
When we use plain 'perf buildid-list' we use only what is in the buildid table in the perf.data header. And those have absolute pathnames because at 'perf record' time we used __perf_session__process_events and that doesn't sets up the path shortening code in map__new() that happens if symbol_conf.full_paths is false, the default. On the other hand, when we use 'perf buildid-list --with-hits' we process all the events using perf_session__process_events, adding entries to the global DSO list _after_ removing the current directory from the DSO name, for presentation purposes. Because of that we end up having two entries in the DSO list when recording events for binaries using relative pathnames. Fix it minimally by setting symbol_conf.full_paths to true when marking the DSOs with hits in 'perf buildid-list --with-hits', as used by 'perf archive' Right fix longer term is to shorten the path only at presentation time. Will be done for 2.6.36. Reported-by: Stephane Eranian <[email protected]> Tested-by: Stephane Eranian <[email protected]> Cc: David S. Miller <[email protected]> Cc: Frédéric Weisbecker <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Mike Galbraith <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Stephane Eranian <[email protected]> Cc: Tom Zanussi <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
2010-06-01drm/i915: add HAS_BSD check to i915_getparamZou Nan hai2-0/+4
This will let userland only try to use the new media decode functionality when the appropriate kernel is present. Signed-off-by: Zou Nan hai <[email protected]> Signed-off-by: Eric Anholt <[email protected]>
2010-06-01drm/i915: Honor sync polarity from VBT panel timing descriptorsAdam Jackson1-0/+10
I'm actually kind of shocked that it works at all otherwise. Signed-off-by: Adam Jackson <[email protected]> Signed-off-by: Eric Anholt <[email protected]>
2010-06-01cifs: fix page refcount leakJeff Layton1-0/+1
Commit 315e995c63a15cb4d4efdbfd70fe2db191917f7a is causing OOM kills when stress-testing a CIFS filesystem. The VFS readpages operation takes a page reference. The older code just handed this reference off to the page cache, but the new code takes an extra one. The simplest fix is to put the new reference after add_to_page_cache_lru. Signed-off-by: Jeff Layton <[email protected]> Acked-by: Nick Piggin <[email protected]> Signed-off-by: Steve French <[email protected]>
2010-06-01Documentation/timers/hpet_example.c: only build on X86Randy Dunlap1-1/+1
We should only build hpet_example on x86[-64], where it is implemented. It can cause build errors on other architectures. Signed-off-by: Randy Dunlap <[email protected]> Reported-by: Heiko Carstens <[email protected]> Cc: Heiko Carstens <[email protected]> Cc: Arjan van de Ven <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-06-01AFS: Fix possible null pointer dereference in afs_alloc_server()Denis Kirjanov1-2/+3
Fix a possible null pointer dereference in afs_alloc_server(): the server pointer is NULL if there was an allocation failure, and under such a condition, we can't dereference it in the _leave() statement. Signed-off-by: Denis Kirjanov <[email protected]> Signed-off-by: David Howells <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-06-01fix cpu_chain section mismatch...Daniel J Blueman1-1/+1
In commit e9fb7631ebcd ("cpu-hotplug: introduce cpu_notify(), __cpu_notify(), cpu_notify_nofail()") the new helper functions access cpu_chain. As a result, it shouldn't be marked __cpuinitdata (via section mismatch warning). Alternatively, the helper functions should be forced inline, or marked __ref or __cpuinit. In the meantime, this patch silences the warning the trivial way. Signed-off-by: Daniel J Blueman <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-06-01ACPI: update feature-removal.txt to reflect deleted acpi=ht optionLen Brown1-9/+0
Per plan, acpi=ht was removed in 2.6.35-rc1. Signed-off-by: Len Brown <[email protected]>
2010-06-01SFI: do not return freed pointerDan Carpenter1-1/+3
We never actually use the return value of sfi_sysfs_install_table() but it still seems wrong to return a freed pointer. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Len Brown <[email protected]>
2010-06-01Merge branch 'for-35' of git://repo.or.cz/linux-kbuildLinus Torvalds111-538/+3023
* 'for-35' of git://repo.or.cz/linux-kbuild: (81 commits) kbuild: Revert part of e8d400a to resolve a conflict kbuild: Fix checking of scm-identifier variable gconfig: add support to show hidden options that have prompts menuconfig: add support to show hidden options which have prompts gconfig: remove show_debug option gconfig: remove dbg_print_ptype() and dbg_print_stype() kconfig: fix zconfdump() kconfig: some small fixes add random binaries to .gitignore kbuild: Include gen_initramfs_list.sh and the file list in the .d file kconfig: recalc symbol value before showing search results .gitignore: ignore *.lzo files headerdep: perlcritic warning scripts/Makefile.lib: Align the output of LZO kbuild: Generate modules.builtin in make modules_install Revert "kbuild: specify absolute paths for cscope" kbuild: Do not unnecessarily regenerate modules.builtin headers_install: use local file handles headers_check: fix perl warnings export_report: fix perl warnings ...
2010-06-01Merge branch 'for-linus' of git://www.jni.nu/crisLinus Torvalds14-90/+97
* 'for-linus' of git://www.jni.nu/cris: CRIS: Don't use mask_irq as symbol name CRIS: Simplify param.h by simply including <asm-generic/param.h> CRISv10: Whitespace fixes for hw_settings.S CRISv10: Trivial fixes. CRISv32: Fix RS485 port 4 CD Kconfig item. CRISv32: Remove duplicated Kconfig items. cris: push down BKL into some device drivers