1. 15 Jan, 2009 8 commits
    • Tony Luck's avatar
      [IA64] Turn on CONFIG_HAVE_UNSTABLE_CLOCK · 0773a6cf
      Tony Luck authored
      sched_clock() on ia64 is based on ar.itc, so is never
      completely synchronized between cpus. On some platforms
      (e.g. certain models of SGI Altix) it may be running at
      radically different frequencies.
      
      Based on a patch from Dimitri Sivanich which set this
      just for SN2 && GENERIC kernels ... it is needed for
      all ia64 machines.
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      0773a6cf
    • Isaku Yamahata's avatar
      [IA64] Update to use account_{steal,idle}_ticks · 7a0b6e01
      Isaku Yamahata authored
      This patch fixes the following errors caused by
      79741dd3 which changed
      the prototypes of account_steal_time() and account_idle_time().
      
      >   CC      arch/ia64/xen/time.o
      > arch/ia64/xen/time.c: In function 'consider_steal_time':
      > arch/ia64/xen/time.c:132: warning: passing argument 1 of 'account_steal_time' makes integer from pointer without a cast
      > arch/ia64/xen/time.c:132: error: too many arguments to function 'account_steal_time'
      > arch/ia64/xen/time.c:133: warning: passing argument 1 of 'account_steal_time' makes integer from pointer without a cast
      > arch/ia64/xen/time.c:133: error: too many arguments to function 'account_steal_time'
      
      Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
      Signed-off-by: default avatarIsaku Yamahata <yamahata@valinux.co.jp>
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      7a0b6e01
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 5393f780
      Linus Torvalds authored
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (29 commits)
        powerpc/83xx: Move mcu_mpc8349emitx driver out of drivers/i2c/chips/
        powerpc/83xx: Make serial ports work on MPC8315E-RDB w/ FSL U-Boots
        powerpc/e500mc: Doorbells need to be taken w/exceptions disabled
        powerpc: Enable PS3 options and QPACE in ppc64_defconfig
        powerpc/powermac: Fix occasional SMP boot failure
        powerpc/cacheinfo: Rename cache_dir per-cpu variable
        hvc_console: Use kzalloc() instead of kmalloc() + memset()
        hvc_console: Do not set low_latency when using interrupts
        hvc_console: Call free_irq() only if request_irq() was successful
        hvc_console: Change an mb() to smp_mb() and add some comments
        powerpc: Cleanup from l64 to ll64 change: drivers/net
        powerpc: Cleanup from l64 to ll64 change: drivers/char
        powerpc: Cleanup from l64 to ll64 change: arch code
        powerpc: Change u64/s64 to a long long integer type
        powerpc/kexec: Check crash_base for relocatable kernel
        powerpc: Make dummy section a valid note header
        Xilinx: SPI: updated driver for device tree
        drivers/of: Add the of_find_i2c_device_by_node function.
        powerpc/xsysace: add compatible string for non-ipcore instance
        powerpc/mpc52xx: remove dead code from GPIO driver
        ...
      5393f780
    • Linus Torvalds's avatar
      Merge branch 'syscalls' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 · bca26856
      Linus Torvalds authored
      * 'syscalls' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (44 commits)
        [CVE-2009-0029] s390 specific system call wrappers
        [CVE-2009-0029] System call wrappers part 33
        [CVE-2009-0029] System call wrappers part 32
        [CVE-2009-0029] System call wrappers part 31
        [CVE-2009-0029] System call wrappers part 30
        [CVE-2009-0029] System call wrappers part 29
        [CVE-2009-0029] System call wrappers part 28
        [CVE-2009-0029] System call wrappers part 27
        [CVE-2009-0029] System call wrappers part 26
        [CVE-2009-0029] System call wrappers part 25
        [CVE-2009-0029] System call wrappers part 24
        [CVE-2009-0029] System call wrappers part 23
        [CVE-2009-0029] System call wrappers part 22
        [CVE-2009-0029] System call wrappers part 21
        [CVE-2009-0029] System call wrappers part 20
        [CVE-2009-0029] System call wrappers part 19
        [CVE-2009-0029] System call wrappers part 18
        [CVE-2009-0029] System call wrappers part 17
        [CVE-2009-0029] System call wrappers part 16
        [CVE-2009-0029] System call wrappers part 15
        ...
      bca26856
    • Harvey Harrison's avatar
      byteorder: make swab.h include asm/swab.h like a regular header · 74d96f01
      Harvey Harrison authored
      Add swab.h to kbuild.asm and remove the individual entries from
      each arch, mark as unifdef as some arches have some kernel-only
      bits inside.
      Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      74d96f01
    • Harvey Harrison's avatar
      cris: introduce asm/swab.h · aa0effbd
      Harvey Harrison authored
      Adjust the arch overrides to the new names as well.
      Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      aa0effbd
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · 5bf431fa
      Linus Torvalds authored
      * 'for-linus' of git://oss.sgi.com/xfs/xfs:
        [XFS] Update maintainers
        [XFS] use scalable vmap API
        [XFS] remove old vmap cache
        [XFS] make xfs_ino_t an unsigned long long
        [XFS] truncate readdir offsets to signed 32 bit values
        [XFS] fix compile of xfs_btree_readahead_lblock on m68k
        [XFS] Remove macro-to-function indirections in the mask code
        [XFS] Remove macro-to-function indirections in attr code
        [XFS] Remove several unused typedefs.
        [XFS] pass XFS_IGET_BULKSTAT to xfs_iget for handle operations
      5bf431fa
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 · c2919f2a
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
        IDE: fix sparse signed-ness errors with host->host_busy
        ide: fix suspend regression
        tx4938ide: Fix build error due to read_sff_dma_status moving
        ide: remove unused CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ
        sl82c105: remove dead code
        via82cxxx: fix cable warning message
        ide: can't use SSD/non-rotational queue flag for all CFA devices
        it821x.c: use dev->revision instead of pci_read_config_byte
        it821x: Add ultra_mask quirk for Vortex86SX
        ide: fix accidental LOCKDEP breakage caused by local_irq_set() removal
      c2919f2a
  2. 14 Jan, 2009 32 commits