21 Apr, 2009

2 commits


20 Apr, 2009

6 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest-and-virtio:
    lguest: document 32-bit and PAE requirements
    lguest: tell git to ignore Documentation/lguest/lguest
    virtio: fix suspend when using virtio_balloon
    lguest: fix guest crash on non-linear addresses in gdt pvops
    lguest: fix crash on vmlinux images

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
    ALSA: hda - Set function_id only on FG nodes
    ALSA: MAINTAINERS - Update SOUND
    ALSA: emu10k1 - off by 1 in snd_emu10k1_wait()
    ASoC: OMAP: Fix FS polarity in OSK5912 machine driver
    ASoC: OMAP: Fix DSP_B format in OMAP McBSP DAI driver
    ASoC: Fix include build error in s3c2412-i2s.c
    ASoC: Fix s3c-i2s-v2.c snd_soc_dai changes
    ASoC: s3c-i2s-v2.c fix for s3c_i2sv2_iis_calc_rate
    ASoC: Fix jive_wm8750.c build problems
    ASoC: pxa-ssp: allow setting of dai format 0
    ALSA: hda - Add upper-limit of mixer amp for AD1884A-laptop model, too
    ALSA: hda - Fix headphone-detection on some machines with STAC/IDT codecs
    ALSA: Intel8x0: Add hp_only quirk for SSID 0x1028016a (Dell Inspiron 8600)
    ALSA: Intel8x0: Remove conflicting quirk for SSID 0x103c0934
    ALSA: hda_intel.c - Consolidate bitfields

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
    kbuild: introduce subdir-ccflags-y
    kbuild: support include/generated

    Linus Torvalds
     
  • This reverts commit 1c55f18717304100a5f624c923f7cb6511b4116d.

    Ingo Brueckl was assuming that reverting to 1:1 mapping for chars >= 128
    was not useful, but it happens to be: due to the limitations of the
    Linux console, when a blind user wants to read BIG5 on it, he has no
    other way than loading a font without SFM and let the 1:1 mapping permit
    the screen reader to get the BIG5 encoding.

    Signed-off-by: Samuel Thibault
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds

    Samuel Thibault
     
  • uses EINVAL so should include . This
    fixes a build error on 64-bit MIPS if CONFIG_SECCOMP is disabled.

    Signed-off-by: Ralf Baechle
    Signed-off-by: Linus Torvalds

    Ralf Baechle
     
  • Since commit 0a1c01c9477602ee8b44548a9405b2c1d587b5a2 ("Make relatime
    default") when a file system is mounted explicitely with noatime it gets
    both the MNT_RELATIME and MNT_NOATIME bits set.

    This shows up like this in /proc/mounts:

    /dev/xxx /yyy ext3 rw,noatime,relatime,errors=continue,data=writeback 0 0

    That looks strange. The VFS uses noatime in this case, but both flags
    are set. So it's more a cosmetic issue, but still better to fix.

    Cc: mjg@redhat.com
    Signed-off-by: Andi Kleen
    Signed-off-by: Linus Torvalds

    Andi Kleen
     

19 Apr, 2009

17 commits

  • Robert noted that we don't actually document that lguest is 32-bit only,
    nor that PAE must be off (CONFIG_PAE is now prompted for if HIGHMEM is
    set to "off).

    Signed-off-by: Rusty Russell
    Cc: lguest@ozlabs.org
    Cc: "Robert P. J. Day"

    Rusty Russell
     
  • This is the example lguest launcher binary.

    Signed-off-by: Matt Kraai
    Signed-off-by: Rusty Russell

    Matt Kraai
     
  • Break out of wait_event_interruptible() if freezing has been requested,
    in the vballoon thread. Without this change vballoon refuses to stop and
    the system can't suspend.

    Signed-off-by: Marcelo Tosatti
    Signed-off-by: Rusty Russell
    Cc: stable@kernel.org

    Marcelo Tosatti
     
  • Fixes guest crash 'lguest: bad read address 0x4800000 len 256'

    The new per-cpu allocator ends up handing a non-linear address to
    write_gdt_entry. We do __pa() on it, and hand it to the host, which
    kills us.

    I've long wanted to make the hypercall "LOAD_GDT_ENTRY" to match the IDT
    code, but had no pressing reason until now.

    Signed-off-by: Rusty Russell
    Cc: lguest@ozlabs.org

    Rusty Russell
     
  • Typical message: 'lguest: unhandled trap 6 at 0x418726 (0x0)'

    vmlinux guests were broken by 4cd8b5e2a159f18a1507f1187b44a1acbfa6341b
    'lguest: use KVM hypercalls', which rewrites guest text from kvm hypercalls
    to trap 31.

    The Launcher mmaps the kernel image. The Guest executes and
    immediately faults in the first text page (read-only). Then it hits a
    hypercall, and we rewrite that hypercall, causing a copy-on-write.
    But the Guest pagetables still refer to the old page: we fault again,
    but as Host we see the hypercall already rewritten, and pass the fault
    back to the Guest. The Guest hasn't set up an IDT yet, so we kill it.

    This doesn't happen with bzImages: they unpack themselves and so the
    text pages are already read-write.

    Signed-off-by: Rusty Russell
    Tested-by: Patrick McHardy

    Matias Zabaljauregui
     
  • * fix/misc:
    ALSA: MAINTAINERS - Update SOUND
    ALSA: emu10k1 - off by 1 in snd_emu10k1_wait()

    Takashi Iwai
     
  • * fix/intel8x0:
    ALSA: Intel8x0: Add hp_only quirk for SSID 0x1028016a (Dell Inspiron 8600)
    ALSA: Intel8x0: Remove conflicting quirk for SSID 0x103c0934

    Takashi Iwai
     
  • * fix/hda:
    ALSA: hda - Set function_id only on FG nodes
    ALSA: hda - Add upper-limit of mixer amp for AD1884A-laptop model, too
    ALSA: hda - Fix headphone-detection on some machines with STAC/IDT codecs
    ALSA: hda_intel.c - Consolidate bitfields

    Takashi Iwai
     
  • * fix/asoc:
    ASoC: OMAP: Fix FS polarity in OSK5912 machine driver
    ASoC: OMAP: Fix DSP_B format in OMAP McBSP DAI driver
    ASoC: Fix include build error in s3c2412-i2s.c
    ASoC: Fix s3c-i2s-v2.c snd_soc_dai changes
    ASoC: s3c-i2s-v2.c fix for s3c_i2sv2_iis_calc_rate
    ASoC: Fix jive_wm8750.c build problems
    ASoC: pxa-ssp: allow setting of dai format 0

    Takashi Iwai
     
  • Following patch introduce support for setting options
    to gcc that has effect for current directory and all
    subdirectories.

    The typical use case are an architecture or a subsystem that
    decide to cover all files with -Werror.
    Today alpha, mips and sparc uses -Werror in almost all their
    Makefile- with subdir-ccflag-y it is now simpler to do so
    as only the top-level directories needs to be covered.

    Likewise if we decide to cover a full subsystem such
    as net/ with -Werror this is done by adding a single
    line to net/Makefile.

    Signed-off-by: Sam Ravnborg
    Cc: Ingo Molnar
    Cc: "H. Peter Anvin"
    Cc: Thomas Gleixner

    Sam Ravnborg
     
  • We need a location for generated files.
    Today they are spread over several places and bringing them
    together to a common place makes it obvious hat is generated
    and what isreal files.

    Al Viro originally suggested: include/gen
    Linus suggested to spell it out.

    This patch implement support for

    include/generated

    All files in include/generated are ignored by git.
    include/generated is removed during "make mrproper".

    With this we are ready to implement support for include/generated
    in the various architctures and in the base kernel.

    Signed-off-by: Sam Ravnborg
    Cc: Al Viro
    Cc: Linus Torvalds

    Sam Ravnborg
     
  • This function is not actually used right now, since the original use
    case for it was done with insert_resource_expand_to_fit() instead.

    However, we now have another usage case that wants to basically do a
    "reserve IO resource, splitting around existing resources", however that
    one doesn't actually want the "recurse into the conflicting resource"
    logic at all.

    And since recursing into the conflicting resource was the most complex
    part, and isn't wanted, just remove it. Maybe we'll some day want both
    versions, but we can just resurrect the logic then.

    Tested-by: Yinghai Lu
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
    cifs: when renaming don't try to unlink negative dentry
    cifs: remove unneeded bcc_ptr update in CIFSTCon
    cifs: add cFYI messages with some of the saved strings from ssetup/tcon
    cifs: fix buffer size for tcon->nativeFileSystem field
    cifs: fix unicode string area word alignment in session setup
    [CIFS] Fix build break caused by change to new current_umask helper function
    [CIFS] Fix sparse warnings
    [CIFS] Add support for posix open during lookup
    cifs: no need to use rcu_assign_pointer on immutable keys
    cifs: remove dnotify thread code
    [CIFS] remove some build warnings
    cifs: vary timeout on writes past EOF based on offset (try #5)
    [CIFS] Fix build break from recent DFS patch when DFS support not enabled
    Remote DFS root support.
    [CIFS] Endian convert UniqueId when reporting inode numbers from server files
    cifs: remove some pointless conditionals before kfree()
    cifs: flush data on any setattr

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
    cs5536: define dma_sff_read_status() method
    ide: fix barriers support
    ide: Remove void casts
    hpt366: use ATA_DMA_* constants
    hpt366: fix HPT370 DMA timeouts

    Linus Torvalds
     
  • …s/security-testing-2.6

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
    Smack: check for SMACK xattr validity in smack_inode_setxattr

    Linus Torvalds
     
  • Re-add missing kernel-parameters documentation that was accidentally
    deleted in commit 0cb55ad2.

    Thanks to Ingo and Weidong Han for the heads-up on this.

    Signed-off-by: Randy Dunlap
    cc: Ingo Molnar
    cc: Len Brown
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • Commit d979677c4c0 ("mm: shrink_all_memory(): use sc.nr_reclaimed")
    broke the memory shrinking used by hibernation, becuse it did not update
    shrink_all_zones() in accordance with the other changes it made.

    Fix this by making shrink_all_zones() update sc->nr_reclaimed instead of
    overwriting its value.

    This fixes http://bugzilla.kernel.org/show_bug.cgi?id=13058

    Reported-and-tested-by: Alan Jenkins
    Signed-off-by: Rafael J. Wysocki
    Signed-off-by: Linus Torvalds

    Rafael J. Wysocki
     

18 Apr, 2009

15 commits

  • The driver somehow got merged with the initializer for the dma_sff_read_status()
    method missing which caused kernel panic on bootup.

    This should fix the kernel.org bug #13026...

    Signed-off-by: Sergei Shtylyov
    Reported-by: Arnd Hannemann
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Sergei Shtylyov
     
  • Freeing non-slab objects is bad and results in an oops. Fix it.

    Reported-and-tested-by: Andrew Price
    Cc: Theodore Tso
    Cc: "Rafael J. Wysocki"
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     
  • Remove uneeded void casts

    Signed-off-by: Jack Stone
    Cc: jeff@garzik.org
    Cc: kernel-janitors@vger.kernel.org
    Cc: Jack Stone
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Jack Stone
     
  • Use ATA_DMA_* constants instead of the bare numbers for the BMIDE register bits.

    Signed-off-by: Sergei Shtylyov
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Sergei Shtylyov
     
  • The big driver change in 2.4.19-rc1 introduced a regression for many HPT370[A]
    chips -- DMA stopped to work completely, only causing endless timeouts...

    The culprit has been identified (at last!): it turned to be the code resetting
    the DMA state machine before each transfer. Stop doing it now as this counter-
    measure has clearly caused more harm than good.

    This should fix the kernel.org bug #7703.

    Signed-off-by: Sergei Shtylyov
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Sergei Shtylyov
     
  • the following patch moves checks for SMACK xattr validity
    from smack_inode_post_setxattr (which cannot return an error to the user)
    to smack_inode_setxattr (which can return an error).

    Signed-off-by: Etienne Basset
    Acked-by: Casey Schaufler
    Signed-off-by: James Morris

    Etienne Basset
     
  • * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
    [libata] fix build error on drivers/ata/pata_legacy.c
    pata_via: Cache and rewrite the device bit
    sata_mv: workaround for multi_count errata sata24
    sata_mv: tidy up qc->tf usage in qc_prep() functions

    Linus Torvalds
     
  • fix those errors:

    drivers/ata/pata_legacy.c: In function ‘pdc_data_xfer_vlb’:
    drivers/ata/pata_legacy.c:289: error: ‘ap’ undeclared (first use in this function)
    drivers/ata/pata_legacy.c:289: error: (Each undeclared identifier is reported only once
    drivers/ata/pata_legacy.c:289: error: for each function it appears in.)
    drivers/ata/pata_legacy.c: At top level:
    drivers/ata/pata_legacy.c:869: error: ‘ATA_PFLAG_PIO32_CHANGE’ undeclared here (not in a
    +function)
    make[2]: *** [drivers/ata/pata_legacy.o] Error 1
    make[1]: *** [drivers/ata] Error 2

    Signed-off-by: Zhenwen Xu
    Acked-by: Alan Cox
    Signed-off-by: Jeff Garzik

    Zhenwen Xu
     
  • Some VIA chipsets will reset the DEV bit after IEN changes on ctl. Our
    optimised write path avoids doing this but we need to remove the
    optimisation on these devices.

    [Identified and some original patches proposed by Josehn Chan @ VIA but
    discussion then all ground to a halt so given a test case I dug it back out]

    Signed-off-by: Alan Cox

    Alan Cox
     
  • Workaround for errata SATA#24 in sata_mv.
    This errata affects WRITE_MULTI* commands when
    the device multi_count produces a DRQ block size >= 4Kbytes.

    We work around it here by converting such operations
    into ordinary PIO_WRITEs instead.

    Note that this might result in a PIO FUA write unavoidably being converted
    into a non-FUA write. In practice, any system using FUA is also going to be
    using DMA rather than PIO, so this shouldn't affect anyone in the real world.

    Signed-off-by: Mark Lord
    Signed-off-by: Jeff Garzik

    Mark Lord
     
  • Tidy up qc->tf accesses in the mv_qc_prep() functions.

    Signed-off-by: Mark Lord
    Signed-off-by: Jeff Garzik

    Mark Lord
     
  • When attempting to rename a file on a read-only share, the kernel can
    call cifs_unlink on a negative dentry, which causes an oops. Only try
    to unlink the file if it's a positive dentry.

    Signed-off-by: Jeff Layton
    Tested-by: Shirish Pargaonkar
    CC: Stable
    Signed-off-by: Steve French

    Jeff Layton
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (43 commits)
    staging: slicoss: update README
    otus/zdusb.c: additional USB idnetifier
    Staging: go7007: fix build issues
    Staging: sxg: Fix leaks and checksum errors in transmit code path
    Staging: sxg: Fix sleep in atomic context warning while loading driver
    Staging: sxg: Use correct queue_id for transmitting non-TCP packets
    Staging: sxg: Fire watchdog timer at end of open routine to change the link
    Staging: Pohmelfs: Add load balancing between network states with the same priority.
    Staging: Pohmelfs: Added IO permissions and priorities.
    Staging: Pohmelfs: Added ->show_stats() callback.
    Staging: Pohmelfs: Drop ftrans debugging code.
    Staging: Pohmelfs: Use wait_on_page_timeout when waiting for remote directory sync instead of hardcoded 25 seconds.
    Staging: Pohmelfs: Reduce debugging noise about non-existing objects.
    Staging: Pohmelfs: Sync fs before killing it, since dentry cache is shrunk before writeback is invoked via generic_shutdown_super()
    Staging: Pohmelfs: Extend remount option.
    Staging: Pohmelfs: Set NETFS_INODE_REMOTE_SYNCED and clear NETFS_INODE_OWNED bits in the root inode.
    Staging: Pohmelfs: Added 'need_lock' variable into debug print.
    Staging: Pohmelfs: Disable read lock in pohmelfs_getattr().
    Staging: Pohmelfs: Move parent lock to the place where we really have to send a lookup request to the server.
    Staging: pohmelfs: Populate dentry cache when receiving the new readdir entry.
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
    UIO: fix specific device driver missing statement for depmod
    Driver core: remove pr_fmt() from dynamic_dev_dbg() printk
    driver core: prevent device_for_each_child from oopsing
    dynamic debug: resurrect old pr_debug() semantics as pr_devel()
    Driver Core: early platform driver
    proc: mounts_poll() make consistent to mdstat_poll
    sysfs: sysfs poll keep the poll rule of regular file.
    driver core: allow non-root users to listen to uevents
    driver core: fix driver_match_device
    sysfs: don't use global workqueue in sysfs_schedule_callback()

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (22 commits)
    WUSB: correct format of wusb_chid sysfs file
    WUSB: fix oops when completing URBs for disconnected devices
    WUSB: disconnect all devices when stopping a WUSB HCD
    USB: whci-hcd: check return value of usb_hcd_link_urb_to_ep()
    USB: whci-hcd: provide a endpoint_reset method
    USB: add reset endpoint operations
    USB device codes for Motorola phone.
    usb-storage: fix mistake in Makefile
    USB: usb-serial ch341: support for DTR/RTS/CTS
    Revert USB: usb-serial ch341: support for DTR/RTS/CTS
    USB: musb: fix possible panic while resuming
    USB: musb: fix isochronous TXDMA (take 2)
    USB: musb: sanitize clearing TXCSR DMA bits (take 2)
    USB: musb: bugfixes for multi-packet TXDMA support
    USB: musb_host, fix ep0 fifo flushing
    USB: usb-storage: augment unusual_devs entry for Simple Tech/Datafab
    USB: musb_host, minor enqueue locking fix (v2)
    USB: fix oops in cdc-wdm in case of malformed descriptors
    USB: qcserial: Add extra device IDs
    USB: option: Add ids for D-Link DWM-652 3.5G modem
    ...

    Linus Torvalds