1. 28 7月, 2008 40 次提交
    • A
      sh: make EARLY_PCI_OP's static · 175fb09f
      Adrian Bunk 提交于
      This patch makes the needlessly global EARLY_PCI_OP's static.
      Signed-off-by: NAdrian Bunk <bunk@kernel.org>
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      175fb09f
    • A
      sh/boards/dreamcast/rtc.c: make 2 functions static · 2b7bf930
      Adrian Bunk 提交于
      This patch makes the needlessly global aica_rtc_{get,set}timeofday()
      static.
      Signed-off-by: NAdrian Bunk <bunk@kernel.org>
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      2b7bf930
    • A
      maple: tidy maple_driver code by removing redundant connect/disconnect · 306cfd63
      Adrian McMenamin 提交于
      The connect and disconnect functions are unnecessary - everything they do can be
      accomplished in the initial probe - so remove them.
      Signed-off-by: NAdrian McMenamin <adrian@mcmen.demon.co.uk>
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      306cfd63
    • N
      sh: Renesas Solutions SH7763RDP board support · 4cec1a37
      Nobuhiro Iwamatsu 提交于
      This patch adds basic support for the SH7763RDP board.
      This supports a basic stuff provided in SH7763, like SCIF,
      NOR Flash and USB host.
      Signed-off-by: NNobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      4cec1a37
    • N
      sh: Add SCIF2 support for SH7763. · c63847a3
      Nobuhiro Iwamatsu 提交于
      SH7763 has 3 SCIF device. Current code supports SCIF0 and 1.
      SCIF0 and 1 are same register constitution, but only SCIF2 is different.
      I added support of SCIF2.
      Signed-off-by: NNobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      c63847a3
    • Y
      sh: Add support Renesas Solutions AP-325RXA board · 04e917b6
      Yusuke Goda 提交于
      This board is SH7723 base board.
      
      This has SCIF, LCDC, USB Host controler, NOR/NAND Flash, Sound,
      Ether and other.
      
      This patch supports SCIF, NOR Flash.
      Signed-off-by: NYusuke Goda <goda.yusuke@renesas.com>
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      04e917b6
    • P
      sh: Initial consolidation of the _32/_64 uaccess split. · 42fd3b14
      Paul Mundt 提交于
      This consolidates everything but the bare assembly routines, which we
      will sync up in a follow-up patch.
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      42fd3b14
    • P
      31f6a11f
    • P
    • P
      sh: Add support for 16kB PAGE_SIZE. · 66dfe181
      Paul Mundt 提交于
      16kB is a useful size on nommu, while 64kB still tends to be too big to
      be useful. Newer MMUs are likely to support this as well, so plug it
      in in anticipation of those, too.
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      66dfe181
    • P
      sh: Support variable page sizes on nommu. · 74fcc779
      Paul Mundt 提交于
      PAGE_SIZE doesn't need to be fixed at 4096 on nommu, so stub in a !MMU
      case for the various PAGE_SIZE Kconfig options.
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      74fcc779
    • P
      sh: Consolidate segment modifiers across mmu/nommu systems. · 02f7e627
      Paul Mundt 提交于
      This moves get_fs/set_fs() and friends in to asm/segment.h. The
      mm_segment_t definition is likewise consolidated from the _32/_64 split.
      
      This is prepatory groundwork for using the generic address space limit
      and verification routines across mmu/nommu configs.
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      02f7e627
    • P
      sh: RSK+ 7203 board support. · 3787aa11
      Paul Mundt 提交于
      This adds initial support for the RTE RSK+ SH7203 board.
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      3787aa11
    • P
      sh: Make dump_task dependent on ELF core. · 2cd1e318
      Paul Mundt 提交于
      Currently this is only linked in for CONFIG_BINFMT_ELF, make it dependent
      on CONFIG_ELF_CORE, so it's both selectable there and also linked in for
      CONFIG_BINFMT_ELF_FDPIC.
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      2cd1e318
    • P
      sh: Initial ELF FDPIC support. · 3bc24a1a
      Paul Mundt 提交于
      This adds initial support for ELF FDPIC on MMU-less SH, as per version
      0.2 of the ABI definition at:
      
      	http://www.codesourcery.com/public/docs/sh-fdpic/sh-fdpic-abi.txtSigned-off-by: NPaul Mundt <lethal@linux-sh.org>
      3bc24a1a
    • P
      binfmt_elf_fdpic: Magical stack pointer index, for NEW_AUX_ENT compat. · 9b14ec35
      Paul Mundt 提交于
      While implementing binfmt_elf_fdpic on SH it quickly became apparent
      that SH was the first platform to support both binfmt_elf_fdpic and
      binfmt_elf, as well as the only of the FDPIC platforms to make use of the
      auxvt.
      
      Currently binfmt_elf_fdpic uses a special version of NEW_AUX_ENT() where
      the first argument is the entry displacement after csp has been adjusted,
      being reset after each adjustment. As we have no ability to sort this out
      through the platform's ARCH_DLINFO, this index needs to be managed
      entirely in create_elf_fdpic_tables(). Presently none of the platforms
      that set their own auxvt entries are able to do so through their
      respective ARCH_DLINFOs when using binfmt_elf_fdpic.
      
      In addition to this, binfmt_elf_fdpic has been looking at
      DLINFO_ARCH_ITEMS for the number of architecture-specific entries in the
      auxvt. This is legacy cruft, and is not defined by any platforms in-tree,
      even those that make heavy use of the auxvt. AT_VECTOR_SIZE_ARCH is
      always available, and contains the number that is of interest here, so we
      switch to using that unconditionally as well.
      
      As this has direct bearing on how much stack is used, platforms that have
      configurable (or dynamically adjustable) NEW_AUX_ENT calls need to either
      make AT_VECTOR_SIZE_ARCH more fine-grained, or leave it as a worst-case
      and live with some lost stack space if those entries aren't pushed (some
      platforms may also need to purposely sacrifice some space here for
      alignment considerations, as noted in the code -- although not an issue
      for any FDPIC-capable platform today).
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      Acked-by: NDavid Howells <dhowells@redhat.com>
      9b14ec35
    • A
      move arch/sh/lib/io.o to obj-y · e3b08600
      Adrian Bunk 提交于
      EXPORT_SYMBOL's in lib-y considered harmful:
      
      <--  snip  -->
      
      ...
        MODPOST 1837 modules
      ERROR: "__raw_readsl" [drivers/ssb/ssb.ko] undefined!
      ERROR: "__raw_writesl" [drivers/ssb/ssb.ko] undefined!
      ERROR: "__raw_writesl" [drivers/net/smc91x.ko] undefined!
      ERROR: "__raw_readsl" [drivers/net/smc91x.ko] undefined!
      ERROR: "__raw_writesl" [drivers/net/3c59x.ko] undefined!
      ERROR: "__raw_readsl" [drivers/net/3c59x.ko] undefined!
      ...
      make[2]: *** [__modpost] Error 1
      
      <--  snip  -->
      Reported-by: NAdrian Bunk <bunk@kernel.org>
      Signed-off-by: NAdrian Bunk <bunk@kernel.org>
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      e3b08600
    • A
      sh dreamcast: export board_pci_channels · 7223ce29
      Adrian Bunk 提交于
      This patch fixes the following build error:
      
      <--  snip  -->
      
      ...
        MODPOST 1837 modules
      ERROR: "board_pci_channels" [drivers/pcmcia/yenta_socket.ko] undefined!
      ...
      make[2]: *** [__modpost] Error 1
      
      <--  snip  -->
      
      I freely admit that it's a pathological configuration, but as long as
      it is allowed it should build.
      Reported-by: NAdrian Bunk <bunk@kernel.org>
      Signed-off-by: NAdrian Bunk <bunk@kernel.org>
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      7223ce29
    • A
      sh: export get_cpu_subtype · b19a33ca
      Adrian Bunk 提交于
      This patch fixes the following build error:
      
      <--  snip  -->
      
      ...
        MODPOST 1837 modules
      ERROR: "get_cpu_subtype" [arch/sh/oprofile/oprofile.ko] undefined!
      ...
      make[2]: *** [__modpost] Error 1
      
      <--  snip  -->
      Reported-by: NAdrian Bunk <bunk@kernel.org>
      Signed-off-by: NAdrian Bunk <bunk@kernel.org>
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      b19a33ca
    • K
      sh: Prevent leaking of CONFIG_SUPERH32 to userspace in asm/unistd.h. · 82706b8f
      Khem Raj 提交于
      CONFIG_SUPERH32 is currently trickling into userspace unistd.h. Attached
      patch uses __SH5__ define in userspace.
      Signed-off-by: NKhem Raj <raj.khem@gmail.com>
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      82706b8f
    • L
      sh: fix seq_file memory leak · 45dabf14
      Li Zefan 提交于
      When using single_open(), single_release() should be used instead
      of seq_release(), otherwise there is a memory leak.
      Signed-off-by: NLi Zefan <lizf@cn.fujitsu.com>
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      45dabf14
    • L
      Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · c9272c4f
      Linus Torvalds 提交于
      * 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
        NFS: Ensure we call nfs_sb_deactive() after releasing the directory inode
        nfs_remount oops when rebooting + possible fix
      c9272c4f
    • L
    • L
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · 3e318b5b
      Linus Torvalds 提交于
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] Fix shared mmap when more than two maps of the same file exist
        [ARM] fix VIPT/VIVT macro optimisations, add comments
        [ARM] 5179/1: Replace obsolete IRQT_* and __IRQT_* values with IRQ_TYPE_*
        [ARM] update defconfig for eseries.
        [ARM] PXA: squash warning in pxafb
        [ARM] pxa: PXA25x UDC - Fix warning during build
        [ARM] fix nwflash.c: 6ee8928d
        [ARM] fix IOP32x, IOP33x, MXC and Samsung builds
        [ARM] pci: provide dummy pci_get_legacy_ide_irq()
        [ARM] fix fls() for 64-bit arguments
        [ARM] fix mode for board-yl-9200.c
        [ARM] 5176/1: arm/Makefile: fix: ARM946T -> ARM946E
      3e318b5b
    • A
      task IO accounting: move all IO statistics in struct task_io_accounting · 940389b8
      Andrea Righi 提交于
      Simplify the code of include/linux/task_io_accounting.h.
      
      It is also more reasonable to have all the task i/o-related statistics in a
      single struct (task_io_accounting).
      Signed-off-by: NAndrea Righi <righi.andrea@gmail.com>
      Signed-off-by: NOleg Nesterov <oleg@tv-sign.ru>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      940389b8
    • T
      NFS: Ensure we call nfs_sb_deactive() after releasing the directory inode · 744d18db
      Trond Myklebust 提交于
      In order to avoid the "Busy inodes after unmount" error message, we need to
      ensure that nfs_async_unlink_release() releases the super block after the
      call to nfs_free_unlinkdata().
      Signed-off-by: NTrond Myklebust <Trond.Myklebust@netapp.com>
      744d18db
    • M
      nfs_remount oops when rebooting + possible fix · 31c94469
      Marc Zyngier 提交于
      Jeff, Trond,
      
      The commit
      
      48b605f8 (NFS: implement option checking
      when remounting NFS filesystems (resend))
      
      generate an Oops on my platform when rebooting while its root FS on
      an NFS share (NFSv3, TCP) :
      
      Unmounting local filesystems...done.
      Unable to handle kernel NULL pointer dereference at virtual address 00000000
      pgd = c3d00000
      [00000000] *pgd=a3d72031, *pte=00000000, *ppte=00000000
      Internal error: Oops: 17 [#1]
      Modules linked in: cpufreq_powersave cpufreq_ondemand cpufreq_userspace cpufreq_conservative ext3 jbd sd_mod pata_pcmcia libata scsi_mod pcmcia loop firmware_class pxafb cfbcopyarea cfbimgblt cfbfillrect pxa2xx_cs pxa2xx_core pcmcia_core snd_pxa2xx_ac97 snd_ac97_codec ac97_bus snd_pxa2xx_pcm snd_pcm_oss snd_mixer_oss snd_pcm snd_timer snd isp116x_hcd soundcore rtc_sa1100 snd_page_alloc pxa25x_udc usbcore rtc_ds1307 rtc_core
      CPU: 0    Not tainted  (2.6.26-03414-g33af79d1-dirty #15)
      PC is at nfs_remount+0x40/0x264
      LR is at do_remount_sb+0x158/0x194
      pc : [<c00bbf54>]    lr : [<c0076c40>]    psr: 60000013
      sp : c2dd1e70  ip : c2dd1e98  fp : c2dd1e94
      r10: 00000040  r9 : c3d17000  r8 : c3c3fc40
      r7 : 00000000  r6 : 00000000  r5 : c3d2b200  r4 : 00000000
      r3 : 00000003  r2 : 00000000  r1 : c2dd1e9c  r0 : c3c3fc00
      Flags: nZCv  IRQs on  FIQs on  Mode SVC_32  ISA ARM  Segment user
      Control: 0000397f  Table: a3d00000  DAC: 00000015
      Process mount (pid: 1462, stack limit = 0xc2dd0270)
      Stack: (0xc2dd1e70 to 0xc2dd2000)
      1e60:                                     00000000 c3c3fc00 00000000 00000000
      1e80: c3c3fc40 c3d17000 c2dd1ebc c2dd1e98 c0076c40 c00bbf20 c01c61e4 00000001
      1ea0: c2dd1ebc 00000001 c3c3fc00 c2dd1ef0 c2dd1ee4 c2dd1ec0 c008c6d8 c0076af4
      1ec0: 00000021 00000040 c2dd1ef0 c3d77000 c3eaa000 00000000 c2dd1f6c c2dd1ee8
      1ee0: c008d1bc c008c5f8 00000000 c2dd0000 c3c0c320 c3805b38 c002064c 0001f820
      1f00: 0001f810 00000001 00000001 00000000 c2dd0000 00000000 c2dd1f34 c2dd1f28
      1f20: c005ead8 c005e6f8 c2dd1f44 c2dd1f38 c005eaf8 c005ead0 c2dd1f6c c2dd1f48
      1f40: c008ae3c 00000000 c3d77000 0001f810 c0ed0021 c0020ca8 c2dd0000 00000000
      1f60: c2dd1fa4 c2dd1f70 c008d2d4 c008d0bc 00000000 0001f810 c2dd1f9c c3eaa000
      1f80: c3d17000 00000000 00000000 be8b6aa8 be8b6ad0 00000015 00000000 c2dd1fa8
      1fa0: c0020b00 c008d254 00000000 be8b6aa8 0001f810 0001f820 0001f830 c0ed0021
      1fc0: 00000000 be8b6aa8 be8b6ad0 00000015 00000000 be8b6ad0 0001f810 be8b6aa8
      1fe0: 0001f810 be8b6964 0000aab8 40125124 60000010 0001f810 00000000 00000000
      Backtrace:
      [<c00bbf14>] (nfs_remount+0x0/0x264) from [<c0076c40>] (do_remount_sb+0x158/0x194)
        r9:c3d17000 r8:c3c3fc40 r7:00000000 r6:00000000 r5:c3c3fc00
      r4:00000000
      [<c0076ae8>] (do_remount_sb+0x0/0x194) from [<c008c6d8>] (do_remount+0xec/0x118)
        r6:c2dd1ef0 r5:c3c3fc00 r4:00000001
      [<c008c5ec>] (do_remount+0x0/0x118) from [<c008d1bc>] (do_mount+0x10c/0x198)
      [<c008d0b0>] (do_mount+0x0/0x198) from [<c008d2d4>] (sys_mount+0x8c/0xd4)
      [<c008d248>] (sys_mount+0x0/0xd4) from [<c0020b00>] (ret_fast_syscall+0x0/0x2c)
        r7:00000015 r6:be8b6ad0 r5:be8b6aa8 r4:00000000
      Code: 0a000086 ea000006 e3530003 8a000004 (e5923000)
      ---[ end trace 55e1b689cf8c8a6a ]---
      ------------[ cut here ]------------
      WARNING: at kernel/exit.c:966 do_exit+0x3c/0x628()
      Modules linked in: cpufreq_powersave cpufreq_ondemand cpufreq_userspace cpufreq_conservative ext3 jbd sd_mod pata_pcmcia libata scsi_mod pcmcia loop firmware_class pxafb cfbcopyarea cfbimgblt cfbfillrect pxa2xx_cs pxa2xx_core pcmcia_core snd_pxa2xx_ac97 snd_ac97_codec ac97_bus snd_pxa2xx_pcm snd_pcm_oss snd_mixer_oss snd_pcm snd_timer snd isp116x_hcd soundcore rtc_sa1100 snd_page_alloc pxa25x_udc usbcore rtc_ds1307 rtc_core
      [<c0025168>] (dump_stack+0x0/0x14) from [<c0032154>] (warn_on_slowpath+0x4c/0x68)
      [<c0032108>] (warn_on_slowpath+0x0/0x68) from [<c003531c>] (do_exit+0x3c/0x628)
        r6:0000000b r5:c3c3dc80 r4:c2dd0000
      [<c00352e0>] (do_exit+0x0/0x628) from [<c0025004>] (die+0x2b0/0x30c)
      [<c0024d54>] (die+0x0/0x30c) from [<c00270bc>] (__do_kernel_fault+0x6c/0x80)
      [<c0027050>] (__do_kernel_fault+0x0/0x80) from [<c00272e0>] (do_page_fault+0x210/0x230)
        r7:c3fa7118 r6:c3c3dc80 r5:c3d166a8 r4:00010000
      [<c00270d0>] (do_page_fault+0x0/0x230) from [<c00201ec>] (do_DataAbort+0x3c/0xa0)
      [<c00201b0>] (do_DataAbort+0x0/0xa0) from [<c002064c>] (__dabt_svc+0x4c/0x60)
      Exception stack(0xc2dd1e28 to 0xc2dd1e70)
      1e20:                   c3c3fc00 c2dd1e9c 00000000 00000003 00000000 c3d2b200
      1e40: 00000000 00000000 c3c3fc40 c3d17000 00000040 c2dd1e94 c2dd1e98 c2dd1e70
      1e60: c0076c40 c00bbf54 60000013 ffffffff
        r8:c3c3fc40 r7:00000000 r6:00000000 r5:c2dd1e5c r4:ffffffff
      [<c00bbf14>] (nfs_remount+0x0/0x264) from [<c0076c40>] (do_remount_sb+0x158/0x194)
        r9:c3d17000 r8:c3c3fc40 r7:00000000 r6:00000000 r5:c3c3fc00
      r4:00000000
      [<c0076ae8>] (do_remount_sb+0x0/0x194) from [<c008c6d8>] (do_remount+0xec/0x118)
        r6:c2dd1ef0 r5:c3c3fc00 r4:00000001
      [<c008c5ec>] (do_remount+0x0/0x118) from [<c008d1bc>] (do_mount+0x10c/0x198)
      [<c008d0b0>] (do_mount+0x0/0x198) from [<c008d2d4>] (sys_mount+0x8c/0xd4)
      [<c008d248>] (sys_mount+0x0/0xd4) from [<c0020b00>] (ret_fast_syscall+0x0/0x2c)
        r7:00000015 r6:be8b6ad0 r5:be8b6aa8 r4:00000000
      ---[ end trace 55e1b689cf8c8a6a ]---
      /etc/rc6.d/S60umountroot: line 17:  1462 Segmentation fault      mount $MOUNT_FORCE_OPT -n -o remount,ro -t dummytype dummydev / 2> /dev/null
      
      The new super.c:nfs_remount function doesn't check the validity of the
      options/options4 pointers. Unfortunately, this seems to happend.
      The obvious patch seems to check the pointers, and not to do anything if
      the happend to be NULL.
      
      Tested on an XScale PXA255 system, latest git.
      
      Regards,
      
      	M.
      Signed-off-by: NMarc Zyngier <marc.zyngier@altran.com>
      Signed-off-by: NTrond Myklebust <Trond.Myklebust@netapp.com>
      31c94469
    • T
      x86: fix cpu hotplug on 32bit · 583323b9
      Thomas Gleixner 提交于
      commit 3e970473 ("x86: boot secondary
      cpus through initial_code") causes the kernel to crash when a CPU is
      brought online after the read only sections have been write
      protected. The write to initial_code in do_boot_cpu() fails.
      
      Move inital_code to .cpuinit.data section.
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Acked-by: NH. Peter Anvin <hpa@zytor.com>
      583323b9
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 · 837b41b5
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
        firewire: state userland requirements in Kconfig help
        firewire: avoid memleak after phy config transmit failure
        firewire: fw-ohci: TSB43AB22/A dualbuffer workaround
        firewire: queue the right number of data
        firewire: warn on unfinished transactions during card removal
        firewire: small fw_fill_request cleanup
        firewire: fully initialize fw_transaction before marking it pending
        firewire: fix race of bus reset with request transmission
      837b41b5
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · 211c8d49
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (59 commits)
        [SCSI] replace __FUNCTION__ with __func__
        [SCSI] extend the last_sector_bug flag to cover more sectors
        [SCSI] qla2xxx: Update version number to 8.02.01-k6.
        [SCSI] qla2xxx: Additional NPIV corrections.
        [SCSI] qla2xxx: suppress uninitialized-var warning
        [SCSI] qla2xxx: use memory_read_from_buffer()
        [SCSI] qla2xxx: Issue proper ISP callbacks during stop-firmware.
        [SCSI] ch: fix ch_remove oops
        [SCSI] 3w-9xxx: add MSI support and misc fixes
        [SCSI] scsi_lib: use blk_rq_tagged in scsi_request_fn
        [SCSI] ibmvfc: Update driver version to 1.0.1
        [SCSI] ibmvfc: Add ADISC support
        [SCSI] ibmvfc: Miscellaneous fixes
        [SCSI] ibmvfc: Fix hang on module removal
        [SCSI] ibmvfc: Target refcounting fixes
        [SCSI] ibmvfc: Reduce unnecessary log noise
        [SCSI] sym53c8xx: free luntbl in sym_hcb_free
        [SCSI] scsi_scan.c: Release mutex in error handling code
        [SCSI] scsi_eh_prep_cmnd should save scmd->underflow
        [SCSI] sd: Support for SCSI disk (SBC) Data Integrity Field
        ...
      211c8d49
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 · 7a82323d
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
        avr32: some mmc/sd cleanups
        include/video/atmel_lcdc.h must #include <linux/workqueue.h>
        avr32: allow system timer to share interrupt to make OProfile work
        drivers/misc/atmel-ssc.c: Removed duplicated include
        avr32: Add platform data for AC97C platform device
        avr32: clean up mci platform code
        fix avr32 build errors
      7a82323d
    • L
      Merge branch 'kvm-updates-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm · b0d8aa08
      Linus Torvalds 提交于
      * 'kvm-updates-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
        KVM: ppc: fix invalidation of large guest pages
        KVM: s390: Fix possible host kernel bug on lctl(g) handling
        KVM: s390: Fix instruction naming for lctlg
        KVM: s390: Fix program check on interrupt delivery handling
        KVM: s390: Change guestaddr type in gaccess
        KVM: s390: Fix guest kconfig
        KVM: s390: Advertise KVM_CAP_USER_MEMORY
        KVM: ia64: Fix irq disabling leak in error handling code
        KVM: VMX: Fix undefined beaviour of EPT after reload kvm-intel.ko
        KVM: VMX: Fix bypass_guest_pf enabling when disable EPT in module parameter
        KVM: task switch: translate guest segment limit to virt-extension byte granular field
        KVM: Avoid instruction emulation when event delivery is pending
        KVM: task switch: use seg regs provided by subarch instead of reading from GDT
        KVM: task switch: segment base is linear address
        KVM: SVM: allow enabling/disabling NPT by reloading only the architecture module
      b0d8aa08
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next · 6948385c
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next: (25 commits)
        setlocalversion: do not describe if there is nothing to describe
        kconfig: fix typos: "Suport" -> "Support"
        kconfig: make defconfig is no longer chatty
        kconfig: make oldconfig is now less chatty
        kconfig: speed up all*config + randconfig
        kconfig: set all new symbols automatically
        kconfig: add diffconfig utility
        kbuild: remove Module.markers during mrproper
        kbuild: sparse needs CF not CHECKFLAGS
        kernel-doc: handle/strip __init
        vmlinux.lds: move __attribute__((__cold__)) functions back into final .text section
        init: fix URL of "The GNU Accounting Utilities"
        kbuild: add arch/$ARCH/include to search path
        kbuild: asm symlink support for arch/$ARCH/include
        kbuild: support arch/$ARCH/include for tags, cscope
        kbuild: prepare headers_* for arch/$ARCH/include
        kbuild: install all headers when arch is changed
        kbuild: make clean removes *.o.* as well
        kbuild: optimize headers_* targets
        kbuild: only one call for include/ in make headers_*
        ...
      6948385c
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 7a76d892
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: talitos - sparse fix
        crypto: talitos - Stop leaking memory in error path
        crypto: talitos - Fix GFP flag usage
        crypto: talitos - Preempt overflow interrupts
        crypto: talitos - Correct dst != src case handling
        crypto: talitos - Remove calls to of_node_put
      7a76d892
    • L
    • S
      isdn: mISDN HFC PCI support depends on virt_to_bus() · 13ffc32e
      Stephen Rothwell 提交于
      On powerpc (allyesconfig build) we get this error:
      
      drivers/isdn/hardware/mISDN/hfcpci.c:1991: error: implicit declaration of function 'virt_to_bus'
      Signed-off-by: NStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      13ffc32e
    • A
      task IO accounting: improve code readability · 5995477a
      Andrea Righi 提交于
      Put all i/o statistics in struct proc_io_accounting and use inline functions to
      initialize and increment statistics, removing a lot of single variable
      assignments.
      
      This also reduces the kernel size as following (with CONFIG_TASK_XACCT=y and
      CONFIG_TASK_IO_ACCOUNTING=y).
      
          text    data     bss     dec     hex filename
         11651       0       0   11651    2d83 kernel/exit.o.before
         11619       0       0   11619    2d63 kernel/exit.o.after
         10886     132     136   11154    2b92 kernel/fork.o.before
         10758     132     136   11026    2b12 kernel/fork.o.after
      
       3082029  807968 4818600 8708597  84e1f5 vmlinux.o.before
       3081869  807968 4818600 8708437  84e155 vmlinux.o.after
      Signed-off-by: NAndrea Righi <righi.andrea@gmail.com>
      Acked-by: NOleg Nesterov <oleg@tv-sign.ru>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      5995477a
    • A
      tracing: remove unused variable · 605ccb73
      Andrea Righi 提交于
      Remove the following warning with CONFIG_TRACING=y:
      
      	kernel/trace/trace.c: In function ‘s_next’:
      	kernel/trace/trace.c:1186: warning: unused variable ‘last_ent’
      Signed-off-by: NAndrea Righi <righi.andrea@gmail.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      605ccb73
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 37561442
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ALSA: Allow to force model to intel-mac-v3 in snd_hda_intel (sigmatel).
        ALSA: cs4232: fix crash during chip PNP detection
        ALSA: hda - Add automatic model setting for the Acer Aspire 5920G laptop
        ALSA: make snd_ac97_add_vmaster() static
        ALSA: sound/pci/azt3328.h: no variables for enums
        ALSA: soc - wm9712 mono mixer
        ALSA: hda - Add support of ASUS Eeepc P90*
        ALSA: opti9xx: no isapnp param for !CONFIG_PNP
        ALSA: opti93x - Fix NULL dereference
        ALSA: hda - Added support for Asus V1Sn
        ALSA: ASoC: Factor PGA DAPM handling into main
        ALSA: ASoC: Refactor DAPM event handler
        ALSA: ALSA: ens1370: communicate PCI device to AC97
        ALSA: ens1370: SRC stands for Sample Rate Converter
        ALSA: hda - Align BDL position adjustment parameter
        ALSA: Au1xpsc: psc not disabled when TX is idle
        ALSA: add TriTech 28023 AC97 codec ID and Wolfson 9701 name.
      37561442
    • A
      missing bits of net-namespace / sysctl · eeb61f71
      Al Viro 提交于
      Piss-poor sysctl registration API strikes again, film at 11...
      
      What we really need is _pathname_ required to be present in already
      registered table, so that kernel could warn about bad order.  That's the
      next target for sysctl stuff (and generally saner and more explicit
      order of initialization of ipv[46] internals wouldn't hurt either).
      
      For the time being, here are full fixups required by ..._rotable()
      stuff; we make per-net sysctl sets descendents of "ro" one and make sure
      that sufficient skeleton is there before we start registering per-net
      sysctls.
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      eeb61f71