aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-04-24cgroups: fix procs documentationKAMEZAWA Hiroyuki1-2/+1
Writing to cgroup.procs is not supported now. Signed-off-by: KAMEZAWA Hiroyuki <[email protected]> Acked-by: Li Zefan <[email protected]> Cc: Ben Blum <[email protected]> Cc: Paul Menage <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-04-24drivers/video/efifb.c: support framebuffer for NVIDIA 9400M in MacBook Pro 5,1Thomas Gerlach1-0/+3
Description of patch: --------------------- This is a patch for the EFI framebuffer driver to enable the framebuffer of the NVIDIA 9400M as found in MacBook Pro (MBP) 5,1 and up. The framebuffer of the NVIDIA graphic cards are located at the following addresses in memory: 9400M: 0xC0010000 9600M GT: 0xB0030000 The patch delivered right here only provides the memory location of the framebuffer of the 9400M device. The 9600M GT is not covered. It is assumed that the 9400M is used when powered up the MBP. The information which device is currently powered and in use is stored in the 64 bytes large EFI variable "gpu-power-prefs". More specifically, byte 0x3B indicates whether 9600M GT (0x00) or 9400M (0x01) is online. The PCI bus IDs are the following: 9400M: PCI 03:00:00 9600M GT: PCI 02:00:00 The EFI variables can be easily read-out and manipulated with "rEFIt", an MBP specific bootloader tool. For more information on how handle rEFIt and EFI variables please consult "http://refit.sourceforge.net" and "http://ubuntuforums.org/archive/index.php/t-1076879.html". IMPORTANT NOTE: The information on how to activate the 9400M device given at "ubuntuforums.org" is not correct, since it states gpu-power-prefs[0x3B] = 0x00 -> 9400M (PCI 02:00:00) gpu-power-prefs[0x3B] = 0x01 -> 9600M GT (PCI 03:00:00) Actually, the assignment of the values and the PCI bus IDs are swapped. Suggestions: ------------ To cover framebuffers of both 9400M and 9600M GT, I would suggest to implement a conditional on "gpu-power-prefs". Depending on the value of byte 0x3B, the according framebuffer is selected. However, this requires kernel access to the EFI variables. [[email protected]: rename optname, per Peter Jones] Signed-off-by: Thomas Gerlach <[email protected]> Acked-by: Peter Jones <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-04-24lis3: add support for HP ProBook 432x/442x/452x/522xTakashi Iwai1-0/+4
Correct axis-mappings for new HP ProBook laptops. Signed-off-by: Takashi Iwai <[email protected]> Acked-by: Eric Piel <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-04-24mtd: fix Orion NAND driver compilation with ARM OABIPaulius Zaleckas1-1/+7
We must tell GCC to use even register for variable passed to ldrd instruction. Without this patch GCC 4.2.1 puts this variable to r2/r3 on EABI and r3/r4 on OABI, so force it to r2/r3. This does not change anything when EABI and OABI compilation works OK. Without this patch and with OABI I get: CC drivers/mtd/nand/orion_nand.o /tmp/ccMkwOCs.s: Assembler messages: /tmp/ccMkwOCs.s:63: Error: first destination register must be even -- `ldrd r3,[ip]' make[5]: *** [drivers/mtd/nand/orion_nand.o] Error 1 Signed-off-by: Paulius Zaleckas <[email protected]> Acked-by: Nicolas Pitre <[email protected]> Acked-by: Artem Bityutskiy <[email protected]> Cc: David Woodhouse <[email protected]> Cc: Jamie Lokier <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-04-24flex_array: fix the panic when calling flex_array_alloc() without __GFP_ZEROChangli Gao1-1/+1
memset() is called with the wrong address and the kernel panics. Signed-off-by: Changli Gao <[email protected]> Cc: Patrick McHardy <[email protected]> Acked-by: David Rientjes <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-04-24kernel/sys.c: fix compat uname machineAndreas Schwab1-1/+1
On ppc64 you get this error: $ setarch ppc -R true setarch: ppc: Unrecognized architecture because uname still reports ppc64 as the machine. So mask off the personality flags when checking for PER_LINUX32. Signed-off-by: Andreas Schwab <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Acked-by: David S. Miller <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-04-24reiserfs: fix corruption during shrinking of xattrsJeff Mahoney1-1/+1
Commit 48b32a3553a54740d236b79a90f20147a25875e3 ("reiserfs: use generic xattr handlers") introduced a problem that causes corruption when extended attributes are replaced with a smaller value. The issue is that the reiserfs_setattr to shrink the xattr file was moved from before the write to after the write. The root issue has always been in the reiserfs xattr code, but was papered over by the fact that in the shrink case, the file would just be expanded again while the xattr was written. The end result is that the last 8 bytes of xattr data are lost. This patch fixes it to use new_size. Addresses https://bugzilla.kernel.org/show_bug.cgi?id=14826 Signed-off-by: Jeff Mahoney <[email protected]> Reported-by: Christian Kujau <[email protected]> Tested-by: Christian Kujau <[email protected]> Cc: Edward Shishkin <[email protected]> Cc: Jethro Beekman <[email protected]> Cc: Greg Surbey <[email protected]> Cc: Marco Gatti <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-04-24memcg: fix prepare migrationAndrea Arcangeli1-2/+2
If a signal is pending (task being killed by sigkill) __mem_cgroup_try_charge will write NULL into &mem, and css_put will oops on null pointer dereference. BUG: unable to handle kernel NULL pointer dereference at 0000000000000010 IP: [<ffffffff810fc6cc>] mem_cgroup_prepare_migration+0x7c/0xc0 PGD a5d89067 PUD a5d8a067 PMD 0 Oops: 0000 [#1] SMP last sysfs file: /sys/devices/platform/microcode/firmware/microcode/loading CPU 0 Modules linked in: nfs lockd nfs_acl auth_rpcgss sunrpc acpi_cpufreq pcspkr sg [last unloaded: microcode] Pid: 5299, comm: largepages Tainted: G W 2.6.34-rc3 #3 Penryn1600SLI-110dB/To Be Filled By O.E.M. RIP: 0010:[<ffffffff810fc6cc>] [<ffffffff810fc6cc>] mem_cgroup_prepare_migration+0x7c/0xc0 [[email protected]: fix merge issues] Signed-off-by: Andrea Arcangeli <[email protected]> Acked-by: KAMEZAWA Hiroyuki <[email protected]> Cc: Balbir Singh <[email protected]> Signed-off-by: Daisuke Nishimura <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-04-24reiserfs: fix permissions on .reiserfs_privJeff Mahoney2-15/+4
Commit 677c9b2e393a0cd203bd54e9c18b012b2c73305a ("reiserfs: remove privroot hiding in lookup") removed the magic from the lookup code to hide the .reiserfs_priv directory since it was getting loaded at mount-time instead. The intent was that the entry would be hidden from the user via a poisoned d_compare, but this was faulty. This introduced a security issue where unprivileged users could access and modify extended attributes or ACLs belonging to other users, including root. This patch resolves the issue by properly hiding .reiserfs_priv. This was the intent of the xattr poisoning code, but it appears to have never worked as expected. This is fixed by using d_revalidate instead of d_compare. This patch makes -oexpose_privroot a no-op. I'm fine leaving it this way. The effort involved in working out the corner cases wrt permissions and caching outweigh the benefit of the feature. Signed-off-by: Jeff Mahoney <[email protected]> Acked-by: Edward Shishkin <[email protected]> Reported-by: Matt McCutchen <[email protected]> Tested-by: Matt McCutchen <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: Al Viro <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-04-23x86: Disable large pages on CPUs with Atom erratum AAE44H. Peter Anvin1-0/+21
Atom erratum AAE44/AAF40/AAG38/AAH41: "If software clears the PS (page size) bit in a present PDE (page directory entry), that will cause linear addresses mapped through this PDE to use 4-KByte pages instead of using a large page after old TLB entries are invalidated. Due to this erratum, if a code fetch uses this PDE before the TLB entry for the large page is invalidated then it may fetch from a different physical address than specified by either the old large page translation or the new 4-KByte page translation. This erratum may also cause speculative code fetches from incorrect addresses." [http://download.intel.com/design/processor/specupdt/319536.pdf] Where as commit 211b3d03c7400f48a781977a50104c9d12f4e229 seems to workaround errata AAH41 (mixed 4K TLBs) it reduces the window of opportunity for the bug to occur and does not totally remove it. This patch disables mixed 4K/4MB page tables totally avoiding the page splitting and not tripping this processor issue. This is based on an original patch by Colin King. Originally-by: Colin Ian King <[email protected]> Cc: Colin Ian King <[email protected]> Cc: Ingo Molnar <[email protected]> Signed-off-by: H. Peter Anvin <[email protected]> LKML-Reference: <[email protected]> Cc: <[email protected]>
2010-04-23x86-64: Clear a 64-bit FS/GS base on fork if selector is nonzeroH. Peter Anvin1-2/+2
When we do a thread switch, we clear the outgoing FS/GS base if the corresponding selector is nonzero. This is taken by __switch_to() as an entry invariant; it does not verify that it is true on entry. However, copy_thread() doesn't enforce this constraint, which can result in inconsistent results after fork(). Make copy_thread() match the behavior of __switch_to(). Reported-and-tested-by: Samuel Thibault <[email protected]> Signed-off-by: H. Peter Anvin <[email protected]> LKML-Reference: <[email protected]> Cc: <[email protected]>
2010-04-23gianfar: Fix potential oops during OF address translationAnton Vorontsov1-5/+1
gianfar driver may pass NULL pointer to the of_translate_address(), which may lead to a kernel oops. Fix this by using of_iomap(), which is also much simpler and shorter. Signed-off-by: Anton Vorontsov <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-04-23fsl_pq_mdio: Fix kernel oops during OF address translationAnton Vorontsov1-6/+14
Old P1020RDB device trees were not specifing tbipa address for MDIO nodes, which is now causing this kernel oops: ... eth2: TX BD ring size for Q[6]: 256 eth2: TX BD ring size for Q[7]: 256 Unable to handle kernel paging request for data at address 0x00000000 Faulting instruction address: 0xc0015504 Oops: Kernel access of bad area, sig: 11 [#1] ... NIP [c0015504] memcpy+0x3c/0x9c LR [c000a9f8] __of_translate_address+0xfc/0x21c Call Trace: [df839e00] [c000a94c] __of_translate_address+0x50/0x21c (unreliable) [df839e50] [c01a33e8] get_gfar_tbipa+0xb0/0xe0 ... The old device trees are buggy, though having a dead ethernet is better than a dead kernel, so fix the issue by using of_iomap(). Also, a somewhat similar issue exist in the probe() routine, though there the oops is only a possibility. Nonetheless, fix it too. Signed-off-by: Anton Vorontsov <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-04-23omap: delete unused bootloader tag variablesAaro Koskinen1-3/+0
They are not needed and add over 512 bytes to kernel data. Signed-off-by: Aaro Koskinen <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23omap: Devkit8000: Remove unused pinsThomas Weber1-20/+0
Old code from original patch contains beagle board pins that are not available on the Devkit8000. Signed-off-by: Thomas Weber <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23omap: Devkit8000: Change position of init callsThomas Weber1-4/+4
Change position of calling serial and ethernet initialization. Signed-off-by: Thomas Weber <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23omap: Devkit8000: Remove unnecessary include fileThomas Weber1-1/+0
Remove include otg.h. Signed-off-by: Thomas Weber <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23omap: Devkit8000: Fix typo in pin nameThomas Weber1-2/+2
Replace wrong sdr_cke[01] with sdrc_cke[01]. Signed-off-by: Thomas Weber <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23omap: Devkit8000: Add missing package selectionThomas Weber1-2/+4
Devkit8000 uses the CUS package for OMAP3530. This patch adds missing package selection for CUS and enables CONFIG_MUX. Replace whitespace with tab in Kconfig. Signed-off-by: Thomas Weber <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23omap: Devkit8000: Fix typo in suppliesThomas Weber1-1/+1
Replace wrong vdss_dsi with vdds_dsi. Signed-off-by: Thomas Weber <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23n8x0_defconfig: remove CONFIG_NILFS2_FS overrideFrancisco Alecrim1-1/+0
arch/arm/configs/n8x0_defconfig:1061:warning: override: reassigning to symbol NILFS2_FS Signed-off-by: Francisco Alecrim <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23omap: board-sdp-flash.c: Fix typos in debug outputThomas Weber1-4/+4
Corrected type of flash in output (OneNAND => NOR). Removed whitespace after newline in output. Removed double whitespace in output. Signed-off-by: Thomas Weber <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23omap4: Fix McBSP4 base addressSantosh Shilimkar1-1/+1
This patch fixes the McBSP4 base address for OMAP4 Signed-off-by: Balaji T K <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23omap: rx51_defconfig: Remove CONFIG_SYSFS_DEPRECATED*=y optionsJarkko Nikula1-2/+0
Modern udev will not work with the CONFIG_SYSFS_DEPRECATED*=y options and it seems also that the Maemo release works without when testing with the Maemo 2.6.28 kernel. Signed-off-by: Jarkko Nikula <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23omap: rx51_defconfig: Remove duplicate phonetJarkko Nikula1-1/+0
Phonet is enabled by the commit bce54fed941e03695ab557100a4bd1e457abca42 and this duplicate gives a warning when doing make rx51_defconfig. Signed-off-by: Jarkko Nikula <[email protected]> Acked-by: Felipe Balbi <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23omap: fix a gpmc nand problemstanley.miao1-0/+3
If gpmc_t isn't given, we don't need to set timing for gpmc, or it will cause a Oops. Signed-off-by: Stanley.Miao <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23AM3517: initialize i2c subsystem after mux subsystemstanley.miao1-2/+2
The initialize of i2c subsystem will set pinmux, so it should be done after the initialize of mux subsystem initialization. Signed-off-by: Stanley.Miao <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23omap: remove one of the define of INT_34XX_BENCH_MPU_EMULstanley.miao1-2/+0
INT_34XX_BENCH_MPU_EMUL was defined twice, another is at Line 312. Signed-off-by: Stanley.Miao <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23omap: fix the compile error if CONFIG_MTD_NAND_OMAP2 is notenabledstanley.miao1-0/+7
If CONFIG_MTD_NAND_OMAP2 is not enabled, there will be a compile error, "gpmc_nand_init() is not defined". Add a inline noop function to fix it. Signed-off-by: Stanley.Miao <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23OMAP4: Clocks: Change SPI Instance NamesAbraham Arce1-4/+4
Change the name for the spi instances on omap44xx_clks to match the names omap2 spi driver gives: omap-mcspi.1 -> omap2_mcspi.1 omap-mcspi.2 -> omap2_mcspi.2 omap-mcspi.3 -> omap2_mcspi.3 omap-mcspi.4 -> omap2_mcspi.4 Signed-off-by: Abraham Arce <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23omap: Devkit8000: Fix wrong usb port on Devkit8000Thomas Weber1-2/+2
Disable the nonexistent ehci port on Devkit8000. Signed-off-by: Thomas Weber <[email protected]> Acked-by: Anand Gadiyar <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23OMAP4: Fix for CONTROL register BaseSantosh Shilimkar1-1/+1
This patch fixes the base address of CONTROL register on OMAP4430SDP. The control base is used by peripherals like MMC1 for PBIAS configuration. Signed-off-by: Santosh Shilimkar <[email protected]> Signed-off-by: Kishore Kadiyala <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23OMAP4-HSMMC: FIX for MMC5 Controller IRQ Basekishore kadiyala1-1/+1
This patch fixes HSMMC Controller5 IRQ Base. Signed-off-by: Kishore Kadiyala <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23omap3: Fix EHCI port for IGEP v2 boardEnric Balletbo i Serra1-4/+4
IGEP v2 uses EHCI port 1 instead of EHCI port 2. Signed-off-by: Enric Balletbo i Serra <[email protected]> Acked-by: Felipe Balbi <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23omap: Fix n8x0 mmc_mmc_init compile warnings and typosTony Lindgren1-9/+9
Fix warning: 'return' with a value, in function returning void in n8x0_mmc_init. Also fix a search and replace typo. Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23omap2: Fix ARM processor check for 24xxTony Lindgren1-1/+1
The value to check is 7 for V6 instead. The code has been working as it falls through to 24xx code if the other checks fail. Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23omap4: Fix build break when used with gcc-4.4.1 (2009-q3)Richard Woodruff2-4/+4
This patch adds argument to smc calls as gcc-4.4.1 requires it otherwise the build breaks with 2009-q3 toolchanin. arch/arm/mach-omap2/omap-headsmp.S: Assembler messages: arch/arm/mach-omap2/omap-headsmp.S:36: Error: missing expression -- `smc' arch/arm/mach-omap2/omap-headsmp.S:55: Error: missing expression -- `smc' arch/arm/mach-omap2/omap-headsmp.S:63: Error: missing expression -- `smc' make[1]: *** [arch/arm/mach-omap2/omap-headsmp.o] Error 1 Signed-off-by: Richard Woodruff <[email protected]> Signed-off-by: Santosh Shilimkar <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23ocfs2_dlmfs: Fix math error when reading LVB.Joel Becker1-1/+1
When asked for a partial read of the LVB in a dlmfs file, we can accidentally calculate a negative count. Reported-by: Dan Carpenter <[email protected]> Cc: <[email protected]> Signed-off-by: Joel Becker <[email protected]>
2010-04-23ocfs2: Update VFS inode's id info after reflink.Tao Ma1-0/+3
In reflink we update the id info on the disk but forgot to update the corresponding information in the VFS inode. Update them accordingly when we want to preserve the attributes. Reported-by: Jeff Liu <[email protected]> Signed-off-by: Tao Ma <[email protected]> Cc: <[email protected]> Signed-off-by: Joel Becker <[email protected]>
2010-04-23ocfs2: potential ERR_PTR dereference on error pathsDan Carpenter1-0/+1
If "handle" is non null at the end of the function then we assume it's a valid pointer and pass it to ocfs2_commit_trans(); Signed-off-by: Dan Carpenter <[email protected]> Cc: <[email protected]> Signed-off-by: Joel Becker <[email protected]>
2010-04-23eeepc-laptop: add missing sparse_keymap_freeCorentin Chary1-2/+1
Also remove legacy keymap which was not used since we use sparse_keymap. Signed-off-by: Corentin Chary <[email protected]>
2010-04-23ocfs2: Add directory entry later in ocfs2_symlink() and ocfs2_mknod()Mark Fasheh1-15/+25
If we get a failure during creation of an inode we'll allow the orphan code to remove the inode, which is correct. However, we need to ensure that we don't get any errors after the call to ocfs2_add_entry(), otherwise we could leave a dangling directory reference. The solution is simple - in both cases, all I had to do was move ocfs2_dentry_attach_lock() above the ocfs2_add_entry() call. Signed-off-by: Mark Fasheh <[email protected]>
2010-04-23ocfs2: use OCFS2_INODE_SKIP_ORPHAN_DIR in ocfs2_mknod error pathLi Dongyang1-5/+11
Mark the inode with flag OCFS2_INODE_SKIP_ORPHAN_DIR in ocfs2_mknod, so we can kill the inode in case of error. [ Fixed up comment style -Mark ] Signed-off-by: Li Dongyang <[email protected]> Signed-off-by: Mark Fasheh <[email protected]>
2010-04-23ocfs2: use OCFS2_INODE_SKIP_ORPHAN_DIR in ocfs2_symlink error pathLi Dongyang1-0/+1
Mark the inode with flag OCFS2_INODE_SKIP_ORPHAN_DIR when we get an error after allocating one, so that we can kill the inode. Signed-off-by: Li Dongyang <[email protected]> Signed-off-by: Mark Fasheh <[email protected]>
2010-04-23ocfs2: add OCFS2_INODE_SKIP_ORPHAN_DIR flag and honor it in the inode wipe codeLi Dongyang3-29/+39
Currently in the error path of ocfs2_symlink and ocfs2_mknod, we just call iput with the inode we failed with, but the inode wipe code will complain because we don't add the inode to orphan dir. One solution would be to lock the orphan dir during the entire transaction, but that's too heavy for a rare error path. Instead, we add a flag, OCFS2_INODE_SKIP_ORPHAN_DIR which tells the inode wipe code that it won't find this inode in the orphan dir. [ Merge fixes and comment style cleanups -Mark ] Signed-off-by: Li Dongyang <[email protected]> Signed-off-by: Mark Fasheh <[email protected]>
2010-04-23Merge branch 'for-linus' of ↵Linus Torvalds5-10/+15
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: hda: Use STAC_DELL_M6_BOTH quirk for Dell Studio 1558 ALSA: hda: Use LPIB quirk for DG965OT board version AAD63733-203 ALSA: snd-meastro3: Ignore spurious HV interrupts during suspend / resume ALSA: snd-meastro3: Add amp_gpio quirk for Compaq EVO N600C ALSA: hda: Use ALC880_F1734 quirk for Fujitsu Siemens AMILO Xi 1526 ALSA: hda: Use STAC_DELL_M6_BOTH quirk for Dell Studio XPS 1645 ALSA: hda - Fix resume from StR of HP 2510p with docking-station
2010-04-23Cleanup generic block based fiemapJosef Bacik2-41/+56
This cleans up a few of the complaints of __generic_block_fiemap. I've fixed all the typing stuff, used inline functions instead of macros, gotten rid of a couple of variables, and made sure the size and block requests are all block aligned. It also fixes a problem where sometimes FIEMAP_EXTENT_LAST wasn't being set properly. Signed-off-by: Josef Bacik <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-04-23drm/i915: fix non-Ironlake 965 class crashesJesse Barnes1-1/+1
My PIPE_CONTROL fix (just sent via Eric's tree) was buggy; I was testing a whole set of patches together and missed a conversion to the new HAS_PIPE_CONTROL macro, which will cause breakage on non-Ironlake 965 class chips. Fortunately, the fix is trivial and has been tested. Be sure to use the HAS_PIPE_CONTROL macro in i915_get_gem_seqno, or we'll end up reading the wrong graphics memory, likely causing hangs, crashes, or worse. Reported-by: Zdenek Kabelac <[email protected]> Reported-by: Toralf Förster <[email protected]> Tested-by: Toralf Förster <[email protected]> Signed-off-by: Jesse Barnes <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-04-23Merge branch 'fix/misc' into for-linusTakashi Iwai1-0/+9
2010-04-23Merge branch 'fix/hda' into for-linusTakashi Iwai4-10/+6
Powered by cgit, Gruvboxed by Blaster4385.