1. 19 9月, 2006 11 次提交
    • L
      Revert mmiocfg heuristics and blacklist changes · 79e453d4
      Linus Torvalds 提交于
      This reverts commits 11012d41 and
      40dd2d20, which allowed us to use the
      MMIO accesses for PCI config cycles even without the area being marked
      reserved in the e820 memory tables.
      
      Those changes were needed for EFI-environment Intel macs, but broke some
      newer Intel 965 boards, so for now it's better to revert to our old
      2.6.17 behaviour and at least avoid introducing any new breakage.
      
      Andi Kleen has a set of patches that work with both EFI and the broken
      Intel 965 boards, which will be applied once they get wider testing.
      
      Cc: Arjan van de Ven <arjan@infradead.org>
      Cc: Edgar Hucek <hostmaster@ed-soft.at>
      Cc: Andi Kleen <ak@suse.de>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      79e453d4
    • L
      Merge git://git.infradead.org/mtd-2.6 · ab5cfd2a
      Linus Torvalds 提交于
      * git://git.infradead.org/mtd-2.6:
        [MTD] Use SEEK_{SET,CUR,END} instead of hardcoded values in mtdchar lseek()
        MTD: Fix bug in fixup_convert_atmel_pri
        [JFFS2][SUMMARY] Fix a summary collecting bug.
        [PATCH] [MTD] DEVICES: Fill more device IDs in the structure of m25p80
        MTD: Add lock/unlock operations for Atmel AT49BV6416
        MTD: Convert Atmel PRI information to AMD format
        fs/jffs2/xattr.c: remove dead code
        [PATCH] [MTD] Maps: Add dependency on alternate probe methods to physmap
        [PATCH] MTD: Add Macronix MX29F040 to JEDEC
        [MTD] Fixes of performance and stability issues in CFI driver.
        block2mtd.c: Make kernel boot command line arguments work (try 4)
        [MTD NAND] Fix lookup error in nand_get_flash_type()
        remove #error on !PCI from pmc551.c
        MTD: [NAND] Fix the sharpsl driver after breakage from a core conversion
        [MTD] NAND: OOB buffer offset fixups
        make fs/jffs2/nodelist.c:jffs2_obsolete_node_frag() static
        [PATCH] [MTD] NAND: fix dead URL in Kconfig
      ab5cfd2a
    • D
      [PATCH] EXT2: Remove superblock lock contention in ext2_statfs · 833f7329
      Dave Kleikamp 提交于
      Fix a performance degradation introduced in 2.6.17.  (30% degradation
      running dbench with 16 threads)
      
      Commit 21730eed, which claims to make
      EXT2_DEBUG work again, moves the taking of the kernel lock out of
      debug-only code in ext2_count_free_inodes and ext2_count_free_blocks and
      into ext2_statfs.
      
      The same problem was fixed in ext3 by removing the lock completely (commit
      5b116879)
      Signed-off-by: NDave Kleikamp <shaggy@austin.ibm.com>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      833f7329
    • M
      [PATCH] headers_check: Clean up asm-parisc/page.h for user headers · ac7fb273
      Matthew Wilcox 提交于
      Remove definitions of PAGE_* from the user view
      Delete unnecessary comments referring to the size of pages
      Only include <asm-generic> if we're in __KERNEL__
      Signed-off-by: NDavid Woodhouse <dwmw2@infradead.org>
      Signed-off-by: NMatthew Wilcox <matthew@wil.cx>
      Signed-off-by: NKyle McMartin <kyle@parisc-linux.org>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      ac7fb273
    • G
      [PATCH] Fix 'make headers_check' on ia64 · 020d8c06
      Geert Uytterhoeven 提交于
      Fix 'make headers_check' on m68k
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      Cc: Roman Zippel <zippel@linux-m68k.org>
      Cc: David Woodhouse <dwmw2@infradead.org>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      020d8c06
    • D
      [PATCH] Add headers_check' target to output of 'make help' · 271fc18e
      David Woodhouse 提交于
      Signed-off-by: NDavid Woodhouse <dwmw2@infradead.org>
      Cc: Sam Ravnborg <sam@ravnborg.org>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      271fc18e
    • I
      [PATCH] genirq core: fix handle_level_irq() · 86998aa6
      Ingo Molnar 提交于
      while porting the -rt tree to 2.6.18-rc7 i noticed the following
      screaming-IRQ scenario on an SMP system:
      
       2274  0Dn.:1 0.001ms: do_IRQ+0xc/0x103  <= (ret_from_intr+0x0/0xf)
       2274  0Dn.:1 0.010ms: do_IRQ+0xc/0x103  <= (ret_from_intr+0x0/0xf)
       2274  0Dn.:1 0.020ms: do_IRQ+0xc/0x103  <= (ret_from_intr+0x0/0xf)
       2274  0Dn.:1 0.029ms: do_IRQ+0xc/0x103  <= (ret_from_intr+0x0/0xf)
       2274  0Dn.:1 0.039ms: do_IRQ+0xc/0x103  <= (ret_from_intr+0x0/0xf)
       2274  0Dn.:1 0.048ms: do_IRQ+0xc/0x103  <= (ret_from_intr+0x0/0xf)
       2274  0Dn.:1 0.058ms: do_IRQ+0xc/0x103  <= (ret_from_intr+0x0/0xf)
       2274  0Dn.:1 0.068ms: do_IRQ+0xc/0x103  <= (ret_from_intr+0x0/0xf)
       2274  0Dn.:1 0.077ms: do_IRQ+0xc/0x103  <= (ret_from_intr+0x0/0xf)
       2274  0Dn.:1 0.087ms: do_IRQ+0xc/0x103  <= (ret_from_intr+0x0/0xf)
       2274  0Dn.:1 0.097ms: do_IRQ+0xc/0x103  <= (ret_from_intr+0x0/0xf)
      
      as it turns out, the bug is caused by handle_level_irq(), which if it
      races with another CPU already handling this IRQ, it _unmasks_ the IRQ
      line on the way out. This is not how 2.6.17 works, and we introduced
      this bug in one of the early genirq cleanups right before it went into
      -mm. (the bug was not in the genirq patchset for a long time, and we
      didnt notice the bug due to the lack of -rt rebase to the new genirq
      code. -rt, and hardirq-preemption in particular opens up such races much
      wider than anything else.)
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Acked-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      86998aa6
    • L
      x86: save/restore eflags in context switch · 47a5c6fa
      Linus Torvalds 提交于
      (And reset it on new thread creation)
      
      It turns out that eflags is important to save and restore not just
      because of iopl, but due to the magic bits like the NT bit, which we
      don't want leaking between different threads.
      Tested-by: NMike Galbraith <efault@gmx.de>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      47a5c6fa
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 1d19f176
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [ATM] CLIP: Do not refer freed skbuff in clip_mkip().
        [NET]: Drop tx lock in dev_watchdog_up
        [PACKET]: Don't truncate non-linear skbs with mmaped IO
        [NET]: Mark frame diverter for future removal.
        [NETFILTER]: Add secmark headers to header-y
        [ATM]: linux-atm-general mailing list is subscribers only
        [ATM]: [he] when transmit fails, unmap the dma regions
        [TCP] tcp-lp: update information to MAINTAINERS
        [TCP] tcp-lp: bug fix for oops in 2.6.18-rc6
        [BRIDGE]: random extra bytes on STP TCN packet
        [IPV6]: Accept -1 for IPV6_TCLASS
        [IPV6]: Fix tclass setting for raw sockets.
        [IPVS]: remove the debug option go ip_vs_ftp
        [IPVS]: Make sure ip_vs_ftp ports are valid
        [IPVS]: auto-help for ip_vs_ftp
        [IPVS]: Document the ports option to ip_vs_ftp in kernel-parameters.txt
        [TCP]: Turn ABC off.
        [NEIGH]: neigh_table_clear() doesn't free stats
      1d19f176
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 20bf94e2
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SPARC]: Fix regression in sys_getdomainname()
        [OPENPROMIO]: Handle current_node being NULL correctly.
      20bf94e2
    • L
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · 77e2782f
      Linus Torvalds 提交于
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] 3815/1: headers_install support for ARM
        [ARM] 3794/1: S3C24XX: do not defined set_irq_wake when no CONFIG_PM
        [ARM] 3793/1: S3C2412: fix wrong serial info struct
        [ARM] 3780/1: Fix iop321 cpuid
        [ARM] 3786/1: pnx4008: update defconfig
        [ARM] 3785/1: S3C2412: Fix idle code as default uses wrong clocks
        [ARM] 3784/1: S3C2413: fix config for MACH_S3C2413/MACH_SMDK2413
      77e2782f
  2. 18 9月, 2006 24 次提交
  3. 17 9月, 2006 5 次提交
    • J
      Merge branch 'master' into upstream-fixes · 803db244
      Jeff Garzik 提交于
      803db244
    • F
      [PATCH] s390: qeth driver fixes [6/6] · 8b98a37c
      Frank Pavlic 提交于
      [PATCH 9/9] s390: qeth driver fixes [6/6]
      
      From: Frank Pavlic <fpavlic@de.ibm.com>
      	- Hipersockets has no IPV6 support, thus prevent issueing
      	  SETRTG_IPV6 control commands on Hipersockets devices.
      	- fixed error handling in qeth_sysfs_(un)register
      Signed-off-by: NFrank Pavlic <fpavlic@de.ibm.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      8b98a37c
    • F
      [PATCH] s390: qeth driver fixes [5/6] · f956b690
      Frank Pavlic 提交于
      [PATCH 8/9] s390: qeth driver fixes [5/6]
      
      From: Frank Pavlic <fpavlic@de.ibm.com>
      	fix kernel panic in qdio queue handling.
      	qeth_qdio_clear_card() could be invoked by 2 CPUs
      	simultaneously (for example reboot event and recovery).
      Signed-off-by: NFrank Pavlic <fpavlic@de.ibm.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      f956b690
    • F
      [PATCH] s390: qeth driver fixes [4/6] · 09d2d38a
      Frank Pavlic 提交于
      [PATCH 7/9] s390: qeth driver fixes [4/6]
      
      From: Frank Pavlic <fpavlic@de.ibm.com>
      	- fix kernel crash due to race,
      	  set card->state to SOFTSETUP after
      	  card and card->dev are initialized properly.
      	- remove CONFIG_QETH_PERF_STATS, use sysfs attribute instead,
      	  as we want to have the ability to turn on/off the
      	  statistics at runtime.
      Signed-off-by: NFrank Pavlic <fpavlic@de.ibm.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      09d2d38a
    • F
      [PATCH] s390: qeth driver fixes [3/6] · f7b65d70
      Frank Pavlic 提交于
      [PATCH 6/9] s390: qeth driver fixes [3/6]
      
      From: Frank Pavlic <fpavlic@de.ibm.com>
             	fixed kernel panic caused by qeth driver:
              Using a bonding device qeth driver will realloc
              headroom for every skb coming from the bond device.
              Once this happens qeth frees the original skb and
              set the skb pointer to the new realloced skb.
              Under heavy transmit workload (e.g.UDP streams) through bond
              network device the qdio output queue might get full.
              In this case we return with EBUSY from qeth_send_packet.
              Returning to qeth_hard_start_xmit routine
              the skb address on the stack still points to the old address,
              which has been freed before.
              Returning from qeth_hard_start_xmit with EBUSY results in
              requeuing the skb. In this case it corrupts the qdisc queue
              and results in kernel panic.
      Signed-off-by: NFrank Pavlic <fpavlic@de.ibm.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      f7b65d70