1. 20 Oct, 2007 29 commits
  2. 19 Oct, 2007 11 commits
    • Linus Torvalds's avatar
      Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86 · 60812a4a
      Linus Torvalds authored
      * ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86: (33 commits)
        x86: convert cpuinfo_x86 array to a per_cpu array
        x86: introduce frame_pointer() and stack_pointer()
        x86 & generic: change to __builtin_prefetch()
        i386: do not BUG_ON() when MSR is unknown
        x86: acpi use cpu_physical_id
        x86: convert cpu_llc_id to be a per cpu variable
        x86: convert cpu_to_apicid to be a per cpu variable
        i386: introduce "used_vectors" bitmap which can be used to reserve vectors.
        x86: use raw locks during oopses
        x86: honor _PAGE_PSE bit on page walks
        i386: do cpuid_device_create() in CPU_UP_PREPARE instead of CPU_ONLINE.
        x86: implement missing x86_64 function smp_call_function_mask()
        x86: use descriptor's functions instead of inline assembly
        i386: consolidate show_regs and show_registers for i386
        i386: make callgraph use dump_trace() on i386/x86_64
        x86: enable iommu_merge by default
        i386: i386 add AMD64 Barcelona PMU MSR definitions to msr.h
        x86: Unify i386 and x86-64 early quirks
        x86: enable HPET on ICH3 and ICH4
        x86: force enable HPET on VT8235/8237 chipsets
        ...
      
      Manually fix trivial conflict with task pid container helper changes in
      arch/x86/kernel/process_32.c
      60812a4a
    • Linus Torvalds's avatar
      Merge git://git.linux-nfs.org/pub/linux/nfs-2.6 · b04cde34
      Linus Torvalds authored
      * git://git.linux-nfs.org/pub/linux/nfs-2.6:
        NFSv4: Fix an rpc_cred reference leakage in fs/nfs/delegation.c
        NFSv4: Ensure that we wait for the CLOSE request to complete
        NFS: Fix a race in sillyrename
        NFS: Fix a writeback race...
      b04cde34
    • Trond Myklebust's avatar
    • Trond Myklebust's avatar
      NFSv4: Ensure that we wait for the CLOSE request to complete · a49c3c77
      Trond Myklebust authored
      Otherwise, we do end up breaking close-to-open semantics. We also end up
      breaking some of the silly-rename tests in Connectathon on some setups.
      
      Please refer to the bug-report at
      	http://bugzilla.linux-nfs.org/show_bug.cgi?id=150Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
      a49c3c77
    • Trond Myklebust's avatar
      NFS: Fix a race in sillyrename · 565277f6
      Trond Myklebust authored
      lookup() and sillyrename() can race one another because the sillyrename()
      completion cannot take the parent directory's inode->i_mutex since the
      latter may be held by whoever is calling dput().
      
      We therefore have little option but to add extra locking to ensure that
      nfs_lookup() and nfs_atomic_open() do not race with the sillyrename
      completion.
      If somebody has looked up the sillyrenamed file in the meantime, we just
      transfer the sillydelete information to the new dentry.
      
      Please refer to the bug-report at
      	http://bugzilla.linux-nfs.org/show_bug.cgi?id=150Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
      565277f6
    • Trond Myklebust's avatar
      NFS: Fix a writeback race... · 61e930a9
      Trond Myklebust authored
      This patch fixes a regression that was introduced by commit
      44dd151d
      
      We cannot zero the user page in nfs_mark_uptodate() any more, since
      
        a) We'd be modifying the page without holding the page lock
        b) We can race with other updates of the page, most notably
           because of the call to nfs_wb_page() in nfs_writepage_setup().
      
      Instead, we do the zeroing in nfs_update_request() if we see that we're
      creating a request that might potentially be marked as up to date.
      
      Thanks to Olivier Paquet for reporting the bug and providing a test-case.
      Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
      61e930a9
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild · 4800be29
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
        kbuild: fix first module build
        kconfig: update kconfig-language text
        kbuild: introduce cc-cross-prefix
        kbuild: disable depmod in cross-compile kernel build
        kbuild: make deb-pkg - add 'Provides:' line
        kconfig: comment typo in scripts/kconfig/Makefile.
        kbuild: stop docproc segfaulting when SRCTREE isn't set.
        kbuild: modpost problem when symbols move from one module to another
        kbuild: cscope - filter out .tmp_* in find_sources
        kbuild: mailing list has moved
        kbuild: check asm symlink when building a kernel
      4800be29
    • Sam Ravnborg's avatar
      kbuild: fix first module build · 7bb9d092
      Sam Ravnborg authored
      When building a specific module before doing a total kernel
      build it failed because $(MORVERDIR) were missing.
      Creating the MODVERDIR explicit (independent of KBUILD_MODULES)
      fixed this. As a side-effect the MODVERDIR will be created
      also for a non-module build - but no harm done by that.
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      7bb9d092
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 · c4ec2071
      Linus Torvalds authored
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (41 commits)
        ACPICA: hw: Don't carry spinlock over suspend
        ACPICA: hw: remove use_lock flag from acpi_hw_register_{read, write}
        ACPI: cpuidle: port idle timer suspend/resume workaround to cpuidle
        ACPI: clean up acpi_enter_sleep_state_prep
        Hibernation: Make sure that ACPI is enabled in acpi_hibernation_finish
        ACPI: suppress uninitialized var warning
        cpuidle: consolidate 2.6.22 cpuidle branch into one patch
        ACPI: thinkpad-acpi: skip blanks before the data when parsing sysfs
        ACPI: AC: Add sysfs interface
        ACPI: SBS: Add sysfs alarm
        ACPI: SBS: Add ACPI_PROCFS around procfs handling code.
        ACPI: SBS: Add support for power_supply class (and sysfs)
        ACPI: SBS: Make SBS reads table-driven.
        ACPI: SBS: Simplify data structures in SBS
        ACPI: SBS: Split host controller (ACPI0001) from SBS driver (ACPI0002)
        ACPI: EC: Add new query handler to list head.
        ACPI: Add acpi_bus_generate_event4() function
        ACPI: Battery: add sysfs alarm
        ACPI: Battery: Add sysfs support
        ACPI: Battery: Misc clean-ups, no functional changes
        ...
      
      Fix up conflicts in drivers/misc/thinkpad_acpi.[ch] manually
      c4ec2071
    • Randy Dunlap's avatar
      kconfig: update kconfig-language text · 6e66b900
      Randy Dunlap authored
      Add kconfig-language docs for mainmenu, def_bool, and def_tristate.
      Remove "requires" as a synonym of "depends on" since it was removed
      from  the parser in commit 247537b9.
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      6e66b900
    • Sam Ravnborg's avatar
      kbuild: introduce cc-cross-prefix · 910b4046
      Sam Ravnborg authored
      cc-cross-prefix is useful for the architecture that like
      to provide a default CROSS_COMPILE value,
      but may have several to select between.
      
      Sample usage:
      
      ifneq ($(SUBARCH),$(ARCH))
              ifeq ($(CROSS_COMPILE),)
                     CROSS_COMPILE := $(call cc-cross-prefix, m68k-linux-gnu- m68k-linux-)
              endif
      endif
      
      Actual usage by the different archs will taken care of later.
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      910b4046