1. 17 Oct, 2008 31 commits
  2. 16 Oct, 2008 9 commits
    • Linus Torvalds's avatar
      {pci,pnp} quirks.c: don't use deprecated print_fn_descriptor_symbol() · 2e532d68
      Linus Torvalds authored
      I dunno how this missed Bjorn and his quest to use %pF in commit
      c80cfb04 ("vsprintf: use new vsprintf
      symbolic function pointer format"), but it did.
      
      So use %pF in the two remaining places that still tried to print out
      function pointers by hand.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      2e532d68
    • Linus Torvalds's avatar
      Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · 52ad0964
      Linus Torvalds authored
      * git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (53 commits)
        NFS: Fix a resolution problem with nfs_inode->cache_change_attribute
        NFS: Fix the resolution problem with nfs_inode_attrs_need_update()
        NFS: Changes to inode->i_nlinks must set the NFS_INO_INVALID_ATTR flag
        RPC/RDMA: ensure connection attempt is complete before signalling.
        RPC/RDMA: correct the reconnect timer backoff
        RPC/RDMA: optionally emit useful transport info upon connect/disconnect.
        RPC/RDMA: reformat a debug printk to keep lines together.
        RPC/RDMA: harden connection logic against missing/late rdma_cm upcalls.
        RPC/RDMA: fix connect/reconnect resource leak.
        RPC/RDMA: return a consistent error, when connect fails.
        RPC/RDMA: adhere to protocol for unpadded client trailing write chunks.
        RPC/RDMA: avoid an oops due to disconnect racing with async upcalls.
        RPC/RDMA: maintain the RPC task bytes-sent statistic.
        RPC/RDMA: suppress retransmit on RPC/RDMA clients.
        RPC/RDMA: fix connection IRD/ORD setting
        RPC/RDMA: support FRMR client memory registration.
        RPC/RDMA: check selected memory registration mode at runtime.
        RPC/RDMA: add data types and new FRMR memory registration enum.
        RPC/RDMA: refactor the inline memory registration code.
        NFS: fix nfs_parse_ip_address() corner case
        ...
      52ad0964
    • Linus Torvalds's avatar
      Merge branch 'sched-fixes-for-linus' of... · 8cde1ad6
      Linus Torvalds authored
      Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        sched_clock: prevent scd->clock from moving backwards
      8cde1ad6
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 6bb7a935
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ALSA: us122l: fix missing unlock in usb_stream_hwdep_vm_fault()
        ALSA: hda - Fix quirk lists for realtek codecs
        ALSA: hda - Add support of ALC272
        ALSA: hda - Add ALC887 support
        ALSA: hda - Add ALC1200 support
        ALSA: hda - Fix PCI SSID of ASUS M90V
        ALSA: hda - Add auto mic switch in realtek auto-probe mode
        ALSA: Fix pxa2xx-ac97-lib.c compilation
        ALSA: ASoC: Hide TLV320AIC26 configuration option for non-OpenFirwmare users
        ALSA: hda: fix nid variable warning
        ALSA: ASoC: Fix compile-time warning for tlv320aic23.c
      6bb7a935
    • Linus Torvalds's avatar
      Merge branch 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm · 08d19f51
      Linus Torvalds authored
      * 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm: (134 commits)
        KVM: ia64: Add intel iommu support for guests.
        KVM: ia64: add directed mmio range support for kvm guests
        KVM: ia64: Make pmt table be able to hold physical mmio entries.
        KVM: Move irqchip_in_kernel() from ioapic.h to irq.h
        KVM: Separate irq ack notification out of arch/x86/kvm/irq.c
        KVM: Change is_mmio_pfn to kvm_is_mmio_pfn, and make it common for all archs
        KVM: Move device assignment logic to common code
        KVM: Device Assignment: Move vtd.c from arch/x86/kvm/ to virt/kvm/
        KVM: VMX: enable invlpg exiting if EPT is disabled
        KVM: x86: Silence various LAPIC-related host kernel messages
        KVM: Device Assignment: Map mmio pages into VT-d page table
        KVM: PIC: enhance IPI avoidance
        KVM: MMU: add "oos_shadow" parameter to disable oos
        KVM: MMU: speed up mmu_unsync_walk
        KVM: MMU: out of sync shadow core
        KVM: MMU: mmu_convert_notrap helper
        KVM: MMU: awareness of new kvm_mmu_zap_page behaviour
        KVM: MMU: mmu_parent_walk
        KVM: x86: trap invlpg
        KVM: MMU: sync roots on mmu reload
        ...
      08d19f51
    • Linus Torvalds's avatar
      Fix kernel/softirq.c printk format warning properly · 1c95e1b6
      Linus Torvalds authored
      This fixes the broken 77af7e34
      ("softirq, warning fix: correct a format to avoid a warning") fix
      correctly.
      
      The type of a pointer subtraction is not "int", nor is it "long".  It
      can be either (or something else).  It's "ptrdiff_t", and the printk
      format for it is "%td".
      
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1c95e1b6
    • Linus Torvalds's avatar
      Merge branch 'core-v28-for-linus' of... · e533b227
      Linus Torvalds authored
      Merge branch 'core-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        do_generic_file_read: s/EINTR/EIO/ if lock_page_killable() fails
        softirq, warning fix: correct a format to avoid a warning
        softirqs, debug: preemption check
        x86, pci-hotplug, calgary / rio: fix EBDA ioremap()
        IO resources, x86: ioremap sanity check to catch mapping requests exceeding, fix
        IO resources, x86: ioremap sanity check to catch mapping requests exceeding the BAR sizes
        softlockup: Documentation/sysctl/kernel.txt: fix softlockup_thresh description
        dmi scan: warn about too early calls to dmi_check_system()
        generic: redefine resource_size_t as phys_addr_t
        generic: make PFN_PHYS explicitly return phys_addr_t
        generic: add phys_addr_t for holding physical addresses
        softirq: allocate less vectors
        IO resources: fix/remove printk
        printk: robustify printk, update comment
        printk: robustify printk, fix #2
        printk: robustify printk, fix
        printk: robustify printk
      
      Fixed up conflicts in:
      	arch/powerpc/include/asm/types.h
      	arch/powerpc/platforms/Kconfig.cputype
      manually.
      e533b227
    • Linus Torvalds's avatar
      Merge branch 'x86-fixes-for-linus' of... · 0999d978
      Linus Torvalds authored
      Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: fix compat-vdso
        x86/mm: unify init task OOM handling
        x86/mm: do not trigger a kernel warning if user-space disables interrupts and generates a page fault
      0999d978
    • Julia Lawall's avatar
      FRV: Eliminate NULL test and memset after alloc_bootmem · 70a3075d
      Julia Lawall authored
      As noted by Akinobu Mita in patch b1fceac2,
      alloc_bootmem and related functions never return NULL and always return a
      zeroed region of memory.  Thus a NULL test or memset after calls to these
      functions is unnecessary.
      
       arch/frv/mm/init.c |    2 --
       1 file changed, 2 deletions(-)
      
      This was fixed using the following semantic patch.
      (http://www.emn.fr/x-info/coccinelle/)
      
      // <smpl>
      @@
      expression E;
      statement S;
      @@
      
      E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\)(...)
      ... when != E
      (
      - BUG_ON (E == NULL);
      |
      - if (E == NULL) S
      )
      
      @@
      expression E,E1;
      @@
      
      E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\)(...)
      ... when != E
      - memset(E,0,E1);
      // </smpl>
      Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      70a3075d