1. 01 5月, 2008 30 次提交
  2. 30 4月, 2008 10 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 · 7cece14a
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
        sparc64: remove duplicated include
        sparc: Add kgdb support.
        kgdbts: Sparc needs sstep emulation.
        sparc32: Kill smp_message_pass() and related code.
        sparc64: Kill PIL_RESERVED, unused.
        sparc64: Split entry.S up into seperate files.
      7cece14a
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 95dfec6a
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (53 commits)
        tcp: Overflow bug in Vegas
        [IPv4] UFO: prevent generation of chained skb destined to UFO device
        iwlwifi: move the selects to the tristate drivers
        ipv4: annotate a few functions __init in ipconfig.c
        atm: ambassador: vcc_sf semaphore to mutex
        MAINTAINERS: The socketcan-core list is subscribers-only.
        netfilter: nf_conntrack: padding breaks conntrack hash on ARM
        ipv4: Update MTU to all related cache entries in ip_rt_frag_needed()
        sch_sfq: use del_timer_sync() in sfq_destroy()
        net: Add compat support for getsockopt (MCAST_MSFILTER)
        net: Several cleanups for the setsockopt compat support.
        ipvs: fix oops in backup for fwmark conn templates
        bridge: kernel panic when unloading bridge module
        bridge: fix error handling in br_add_if()
        netfilter: {nfnetlink,ip,ip6}_queue: fix skb_over_panic when enlarging packets
        netfilter: x_tables: fix net namespace leak when reading /proc/net/xxx_tables_names
        netfilter: xt_TCPOPTSTRIP: signed tcphoff for ipv6_skip_exthdr() retval
        tcp: Limit cwnd growth when deferring for GSO
        tcp: Allow send-limited cwnd to grow up to max_burst when gso disabled
        [netdrvr] gianfar: Determine TBIPA value dynamically
        ...
      95dfec6a
    • I
      inlining: do not allow gcc below version 4 to optimize inlining · ae3a0064
      Ingo Molnar 提交于
      fix the condition to match intention: always use the old inlining
      behavior on all gcc versions below 4.
      
      this should solve the UML build problem.
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ae3a0064
    • S
      Update .mailmap · 53809d7e
      S.Çağlar Onur 提交于
      I realize some of the maintainers email clients and/or scripts cannot
      handle UTF-8 encoded names properly, as a result your ChangeLogs
      displays me as two different person :).
      
      Following patch adds correctly encoded name of mine into .mailmap, to
      prevent appearing it not to be so or badly displayed.
      Signed-off-by: NS.Çağlar Onur <caglar@pardus.org.tr>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      53809d7e
    • L
      Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 · d67c6f86
      Linus Torvalds 提交于
      * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
        [S390] Update default configuration.
        [S390] use generic sys_ptrace
        [S390] Remove self ptrace IEEE_IP hack.
        [S390] Convert to SPARSEMEM & SPARSEMEM_VMEMMAP
        [S390] System z large page support.
        [S390] Convert machine feature detection code to C.
        [S390] vmemmap: use clear_table to initialise page tables.
        [S390] Move stfl to system.h and delete duplicated version.
        [S390] uaccess_mvcos: #ifdef config dependent code.
        [S390] cpu topology: Fix possible deadlock.
        [S390] Add topology_core_siblings to topology.h
        [S390] cio: Make isc handling more robust.
        [S390] remove -traditional
        [S390] Automatically detect added cpus.
        [S390] smp: Fix locking order.
        [S390] Add missing ifndef/define to include/asm-s390/sysinfo.h.
        [S390] Move show_regs to traps.c.
        [S390] cio: Use strict_strtoul() for attributes.
      d67c6f86
    • L
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · ec31b212
      Linus Torvalds 提交于
      * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
        [POWERPC] Fix crashkernel= handling when no crashkernel= specified
        [POWERPC] Make emergency stack safe for current_thread_info() use
        [POWERPC] spufs: add .gitignore for spu_save_dump.h & spu_restore_dump.h
        [POWERPC] spufs: trace spu_acquire_saved events
        [POWERPC] spufs: fix marker name for find_victim
        [POWERPC] spufs: add marker for destroy_spu_context
        [POWERPC] spufs: add sputrace marker parameter names
        [POWERPC] spufs: add context switch notification log
        [POWERPC] mpc5200: defconfigs for CM5200, Lite5200B, Motion-PRO and TQM5200
        [POWERPC] mpc5200: Switch mpc5200 dts files to dts-v1 format
        [POWERPC] mpc5200: Fix FEC error handling on FIFO errors
        [POWERPC] mpc5200: add Phytec pcm030 board support
        [POWERPC] mpc5200: add gpiolib support for mpc5200
        [POWERPC] mpc5200: add interrupt type function
        [POWERPC] mpc5200: Fix unterminated of_device_id table
      ec31b212
    • I
      fix drivers/media/common/tuners/ build bug · ca72cddf
      Ingo Molnar 提交于
      x86.git randconfig testing found a build failure on latest -git:
      
       drivers/built-in.o: In function `set_type':
       tuner-core.c:(.text+0x2a9a26): undefined reference to `tea5761_attach'
       tuner-core.c:(.text+0x2a9d05): undefined reference to `tda9887_attach'
       tuner-core.c:(.text+0x2a9d51): undefined reference to `xc2028_attach'
       tuner-core.c:(.text+0x2a9e22): undefined reference to `tda829x_attach'
       tuner-core.c:(.text+0x2a9e3f): undefined reference to `microtune_attach'
       drivers/built-in.o: In function `tuner_probe':
       tuner-core.c:(.text+0x2aa18a): undefined reference to `tda829x_probe'
       tuner-core.c:(.text+0x2aa302): undefined reference to `tea5761_autodetection'
      
      with the following config:
      
       http://redhat.com/~mingo/misc/config-Wed_Apr_30_10_21_40_CEST_2008.bad
      
      the problem is caused by the drivers/media/common/tuners/ subdirectory
      not being part of the kbuild hierarchy anymore, due to commit
      7c91f062 ("V4L/DVB(7767): Move tuners to common/tuners").
      
      this seems similar to the problem also reported by Mike Galbraith.
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      Acked-by: NSam Ravnborg <sam@ravnborg.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ca72cddf
    • A
      revert "memory hotplug: allocate usemap on the section with pgdat" · 51674644
      Andrew Morton 提交于
      This:
      
      commit 86f6dae1
      Author: Yasunori Goto <y-goto@jp.fujitsu.com>
      Date:   Mon Apr 28 02:13:33 2008 -0700
      
          memory hotplug: allocate usemap on the section with pgdat
      
          Usemaps are allocated on the section which has pgdat by this.
      
          Because usemap size is very small, many other sections usemaps are allocated
          on only one page.  If a section has usemap, it can't be removed until removing
          other sections.  This dependency is not desirable for memory removing.
      
          Pgdat has similar feature.  When a section has pgdat area, it must be the last
          section for removing on the node.  So, if section A has pgdat and section B
          has usemap for section A, Both sections can't be removed due to dependency
          each other.
      
          To solve this issue, this patch collects usemap on same section with pgdat.
          If other sections doesn't have any dependency, this section will be able to be
          removed finally.
      Signed-off-by: NYasunori Goto <y-goto@jp.fujitsu.com>
          Cc: Badari Pulavarty <pbadari@us.ibm.com>
          Cc: Yinghai Lu <yhlu.kernel@gmail.com>
          Cc: Yasunori Goto <y-goto@jp.fujitsu.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      
      broke davem's sparc64 bootup.  Revert it while we work out what went wrong.
      
      Cc: Yasunori Goto <y-goto@jp.fujitsu.com>
      Cc: Badari Pulavarty <pbadari@us.ibm.com>
      Cc: Yinghai Lu <yhlu.kernel@gmail.com>
      Cc: "David S. Miller" <davem@davemloft.net>
      Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      51674644
    • N
      mm: fix warning on memory offline · 3a902c5f
      Nick Piggin 提交于
      KAMEZAWA Hiroyuki found a warning message in the buffer dirtying code that
      is coming from page migration caller.
      
      WARNING: at fs/buffer.c:720 __set_page_dirty+0x330/0x360()
      Call Trace:
       [<a000000100015220>] show_stack+0x80/0xa0
       [<a000000100015270>] dump_stack+0x30/0x60
       [<a000000100089ed0>] warn_on_slowpath+0x90/0xe0
       [<a0000001001f8b10>] __set_page_dirty+0x330/0x360
       [<a0000001001ffb90>] __set_page_dirty_buffers+0xd0/0x280
       [<a00000010012fec0>] set_page_dirty+0xc0/0x260
       [<a000000100195670>] migrate_page_copy+0x5d0/0x5e0
       [<a000000100197840>] buffer_migrate_page+0x2e0/0x3c0
       [<a000000100195eb0>] migrate_pages+0x770/0xe00
      
      What was happening is that migrate_page_copy wants to transfer the PG_dirty
      bit from old page to new page, so what it would do is set_page_dirty(newpage).
      However set_page_dirty() is used to set the entire page dirty, wheras in
      this case, only part of the page was dirty, and it also was not uptodate.
      
      Marking the whole page dirty with set_page_dirty would lead to corruption or
      unresolvable conditions -- a dirty && !uptodate page and dirty && !uptodate
      buffers.
      
      Possibly we could just ClearPageDirty(oldpage); SetPageDirty(newpage);
      however in the interests of keeping the change minimal...
      Signed-off-by: NNick Piggin <npiggin@suse.de>
      Tested-by: NKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      3a902c5f
    • R
      Drop the exporting of empty <linux/byteorder/generic.h> · 969a19f1
      Robert P. J. Day 提交于
      Fix up the contents of <linux/byteorder/> so that it doesn't export a
      content-free generic.h to user space.  This involves:
      
      * Removing the __KERNEL__ tests from generic.h and dropping it from
        Kbuild.
      * Wrapping the inclusions of generic.h in both big_endian.h and
        little_endian.h in __KERNEL__ tests.
      * Shifting big_endian.h and little_endian.h from header-y to
        unifdef-y in Kbuild.
      Signed-off-by: NRobert P. J. Day <rpjday@crashcourse.ca>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      969a19f1