1. 29 3月, 2008 18 次提交
    • J
      pci: revert SMBus unhide on HP Compaq nx6110 · a99acc83
      Jean Delvare 提交于
      This reverts commit 3c0a654e and
      fixes kernel bug #10245:
      
      	http://bugzilla.kernel.org/show_bug.cgi?id=10245
      
      The HP Compaq nc6120 has the same PCI sub-device ID as the nx6110, and the
      SMBus is used by ACPI for thermal management on the nc6120, so Linux should
      not attach a native driver to it.  This means that this quirk is unsafe and
      has to be removed.
      
      I also added a comment to help developers realize that adding new IDs to this
      SMBus unhiding quirk table should be done only with great care, and in
      particular only after checking that ACPI is not making use of the SMBus.
      Signed-off-by: NJean Delvare <khali@linux-fr.org>
      Cc: Tomasz Koprowski <tomek@koprowski.org>
      Acked-by: NGreg Kroah-Hartman <gregkh@suse.de>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      a99acc83
    • C
      ext3: don't export ext3_fs.h and jbd.h · 5ac7ec85
      Christoph Hellwig 提交于
      Neither of the headers actually compiles when included from userpsace nor
      should it be made available as userspace tools should be using the libraries
      or at least headers from e2fsprogs.
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Acked-by: N"Theodore Ts'o" <tytso@mit.edu>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      5ac7ec85
    • H
      kernel: add bit rotation helpers for 16 and 8 bit · 3afe3925
      Harvey Harrison 提交于
      Will replace open-coded variants elsewhere.  Done in the same
      style as the 32-bit versions.
      Signed-off-by: NHarvey Harrison <harvey.harrison@gmail.com>
      Acked-by: NRandy Dunlap <randy.dunlap@oracle.com>
      Cc: Johannes Berg <johannes@sipsolutions.net>
      Cc: John W. Linville <linville@tuxdriver.com>
      Cc: Joe Perches <joe@perches.com>
      Cc: Jiri Benc <jbenc@suse.cz>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      3afe3925
    • A
      ixp4xx-beeper: add MODULE_ALIAS · 589499c0
      Alessandro Zummo 提交于
      The following patch allows ixp4xx-beeper to be loaded by udev
      automatically when compiled as a module with kernel versions 2.4.24 and
      greater.
      
      This patch is required because 43cc71ee
      ("platform: prefix MODALIAS with "platform:"") changed the modalias
      string to have the extra prefix.
      
      LKG7102D7:~# udevinfo -a -p /sys/devices/platform/ixp4xx-beeper.4
      
       looking at device '/devices/platform/ixp4xx-beeper.4':
         KERNEL=="ixp4xx-beeper.4"
         SUBSYSTEM=="platform"
         DRIVER==""
         ATTR{modalias}=="platform:ixp4xx-beeper"
      
      udev therefore tries to modprobe platform:ixp4xx-beeper instead of
      ixp4xx-beeper.
      
      LKG7102D7:~# udevtest /sys/devices/platform/ixp4xx-beeper.4
      ...
      import_uevent_var: import into environment: 'PHYSDEVBUS=platform'
      import_uevent_var: import into environment: 'MODALIAS=platform:ixp4xx-beeper'
      main: looking at device '/devices/platform/ixp4xx-beeper.4' from
      subsystem 'platform'
      wait_for_sysfs: file '/sys/devices/platform/ixp4xx-beeper.4/bus'
      appeared after 0 loops
      main: run: 'socket:/org/kernel/udev/monitor'
      main: run: '/sbin/modprobe --use-blacklist platform:ixp4xx-beeper'
      
      With this patch, depmod adds an alias line (see below) to
      modules.alias which allows modprobe to load the right module.
      
      alias platform:ixp4xx-beeper ixp4xx-beeper
      Signed-off-by: NGordon Farquharson <gordonfarquharson@gmail.com>
      Signed-off-by: NAlessandro Zummo <a.zummo@towertech.it>
      Cc: Kay Sievers <kay.sievers@vrfy.org>
      Cc: David Brownell <david-b@pacbell.net>
      Cc: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
      Cc: Greg Kroah-Hartman <gregkh@suse.de>
      Cc: Dmitry Torokhov <dtor@mail.ru>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      589499c0
    • A
      update checkpatch.pl to version 0.16 · 773647a0
      Andy Whitcroft 提交于
      This version brings proper quote tracking across lines, and brings the
      handling of comments into the same mechanism ensuring nesting is correctly
      handled.  It brings the usual flurry of fixes for false positives.  It also
      brings a number of new checks.  The most contentious change will likely be
      the checks for NR_CPUS as this throws some new warnings in kernel/sched.c.
      
      Of note:
       - all new quote tracking across lines
       - all new comment tracking
       - new more direct, less ambigious wording for some warnings
       - recommends mutexes and completions over semaphores
       - recommends strict_strto* over simple_strto*
       - report on direct use of NR_CPUS
      
      Andy Whitcroft (22):
            Version: 0.16
            string quote tracking should cross line boundaries
            check spacing round -> correctly across newlines
            checks for linux/ against asm/ include files should be warnings
            standardise on 'required' and 'prohibited'
            take the first end of condition when parsing statements
            values: cope with unbalanced brackets
            preprocessor #elif is not a function
            preprocessor #if should not trigger trailing statement checks
            test: allow us to limit output to a single error
            recommend real mutexes over semaphores
            asm checks should mirror those for __asm__
            warn on semaphores being used in place of completions
            trailing ; on control structure should ignore do {} while ();
            recommend strict_strtoX over simple_strtoX
            redo comment handling as a quote type
            use of NR_CPUS is normally wrong
            consistant spacing should only be about spaces
            if brace check suppression should only apply to the top-levels
            use tr/// to align spacing for operators
            move to using four parameter form of substr
            check and report modifications to include/asm
      Signed-off-by: NAndy Whitcroft <apw@shadowen.org>
      Cc: Ingo Molnar <mingo@elte.hu>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      773647a0
    • A
      net/9p/trans_fd.c:p9_trans_fd_init(): module_init functions should return 0 on success · 3387b804
      Andrew Morton 提交于
      Mar 23 09:06:31 opensuse103 kernel: Installing 9P2000 support
      Mar 23 09:06:31 opensuse103 kernel: sys_init_module: '9pnet_fd'->init suspiciously returned 1, it should follow 0/-E convention
      Mar 23 09:06:31 opensuse103 kernel: sys_init_module: loading module anyway...
      Mar 23 09:06:31 opensuse103 kernel: Pid: 5323, comm: modprobe Not tainted 2.6.25-rc6-git7-default #1
      Mar 23 09:06:31 opensuse103 kernel:  [<c013c253>] sys_init_module+0x172b/0x17c9
      Mar 23 09:06:31 opensuse103 kernel:  [<c0108a6a>] sys_mmap2+0x62/0x77
      Mar 23 09:06:31 opensuse103 kernel:  [<c01059c4>] sysenter_past_esp+0x6d/0xa9
      Mar 23 09:06:31 opensuse103 kernel:  =======================
      
      Cc: Latchesar Ionkov <lucho@ionkov.net>
      Cc: Eric Van Hensbergen <ericvh@opteron.(none)>
      Cc: David S. Miller <davem@davemloft.net>
      Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
      Cc: <devzero@web.de>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      3387b804
    • D
      audit: silence two kerneldoc warnings in kernel/audit.c · f706d5d2
      Dave Jones 提交于
      Silence two kerneldoc warnings.
      
      Warning(kernel/audit.c:1276): No description found for parameter 'string'
      Warning(kernel/audit.c:1276): No description found for parameter 'len'
      
      [also fix a typo for bonus points]
      Signed-off-by: NDave Jones <davej@codemonkey.org.uk>
      Acked-by: NRandy Dunlap <randy.dunlap@oracle.com>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      f706d5d2
    • S
      afs: prevent double cell registration · 5214b729
      Sven Schnelle 提交于
      kafs doesn't check if the cell already exists - so if you do an echo "add
      newcell.org 1.2.3.4" >/proc/fs/afs/cells it will try to create this cell
      again.  kobject will also complain about a double registration.  To prevent
      such problems, return -EEXIST in that case.
      Signed-off-by: NSven Schnelle <svens@stackframe.org>
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      5214b729
    • D
      afs: add a MAINTAINERS record for AFS · fac533c2
      David Howells 提交于
      Add a MAINTAINERS record for AFS.
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      fac533c2
    • D
      vfs: fix data leak in nobh_write_end() · 5b41e74a
      Dmitri Monakhov 提交于
      Current nobh_write_end() implementation ignore partial writes(copied < len)
      case if page was fully mapped and simply mark page as Uptodate, which is
      totally wrong because area [pos+copied, pos+len) wasn't updated explicitly in
      previous write_begin call.  It simply contains garbage from pagecache and
      result in data leakage.
      
      #TEST_CASE_BEGIN:
      ~~~~~~~~~~~~~~~~
      In fact issue triggered by classical testcase
      	open("/mnt/test", O_RDWR|O_CREAT|O_TRUNC, 0666) = 3
      	ftruncate(3, 409600)                    = 0
      	writev(3, [{"a", 1}, {NULL, 4095}], 2)  = 1
      ##TESTCASE_SOURCE:
      ~~~~~~~~~~~~~~~~~
      #include <stdio.h>
      #include <stdlib.h>
      #include <fcntl.h>
      #include <sys/uio.h>
      #include <sys/mman.h>
      #include <errno.h>
      int main(int argc, char **argv)
      {
      	int fd,  ret;
      	void* p;
      	struct iovec iov[2];
      	fd = open(argv[1], O_RDWR|O_CREAT|O_TRUNC, 0666);
      	ftruncate(fd, 409600);
      	iov[0].iov_base="a";
      	iov[0].iov_len=1;
      	iov[1].iov_base=NULL;
      	iov[1].iov_len=4096;
      	ret = writev(fd, iov, sizeof(iov)/sizeof(struct iovec));
      	printf("writev  = %d, err = %d\n", ret, errno);
      	return 0;
      }
      ##TESTCASE RESULT:
      ~~~~~~~~~~~~~~~~~~
      [root@ts63 ~]# mount | grep mnt2
      /dev/mapper/test on /mnt2 type ext2 (rw,nobh)
      [root@ts63 ~]#  /tmp/writev /mnt2/test
      writev  = 1, err = 0
      [root@ts63 ~]# hexdump -C /mnt2/test
      
      00000000  61 65 62 6f 6f 74 00 00  f0 b9 b4 59 3a 00 00 00  |aeboot.....Y:...|
      00000010  20 00 00 00 00 00 00 00  21 00 00 00 00 00 00 00  | .......!.......|
      00000020  df df df df df df df df  df df df df df df df df  |................|
      00000030  3a 00 00 00 2a 00 00 00  21 00 00 00 00 00 00 00  |:...*...!.......|
      00000040  60 c0 8c 00 00 00 00 00  40 4a 8d 00 00 00 00 00  |`.......@J......|
      00000050  00 00 00 00 00 00 00 00  41 00 00 00 00 00 00 00  |........A.......|
      00000060  74 69 6d 65 20 64 64 20  69 66 3d 2f 64 65 76 2f  |time dd if=/dev/|
      00000070  6c 6f 6f 70 30 20 20 6f  66 3d 2f 64 65 76 2f 6e  |loop0  of=/dev/n|
      skip..
      00000f50  00 00 00 00 00 00 00 00  31 00 00 00 00 00 00 00  |........1.......|
      00000f60  6d 6b 66 73 2e 65 78 74  33 20 2f 64 65 76 2f 76  |mkfs.ext3 /dev/v|
      00000f70  7a 76 67 2f 74 65 73 74  20 2d 62 34 30 39 36 00  |zvg/test -b4096.|
      00000f80  a0 fe 8c 00 00 00 00 00  21 00 00 00 00 00 00 00  |........!.......|
      00000f90  23 31 32 30 35 39 35 30  34 30 34 00 3a 00 00 00  |#1205950404.:...|
      00000fa0  20 00 8d 00 00 00 00 00  21 00 00 00 00 00 00 00  | .......!.......|
      00000fb0  d0 cf 8c 00 00 00 00 00  10 d0 8c 00 00 00 00 00  |................|
      00000fc0  00 00 00 00 00 00 00 00  41 00 00 00 00 00 00 00  |........A.......|
      00000fd0  6d 6f 75 6e 74 20 2f 64  65 76 2f 76 7a 76 67 2f  |mount /dev/vzvg/|
      00000fe0  74 65 73 74 20 20 2f 76  7a 20 2d 6f 20 64 61 74  |test  /vz -o dat|
      00000ff0  61 3d 77 72 69 74 65 62  61 63 6b 00 00 00 00 00  |a=writeback.....|
      00001000  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
      
      As you can see file's page contains garbage from pagecache instead of zeros.
      #TEST_CASE_END
      
      Attached patch:
      - Add sanity check BUG_ON in order to prevent incorrect usage by caller,
        This is function invariant because page can has buffers and in no zero
        *fadata pointer at the same time.
      - Always attach buffers to page is it is partial write case.
      - Always switch back to generic_write_end if page has buffers.
        This is reasonable because if page already has buffer then generic_write_begin
        was called previously.
      Signed-off-by: NDmitri Monakhov <dmonakhov@openvz.org>
      Reviewed-by: NNick Piggin <npiggin@suse.de>
      Cc: <stable@kernel.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      5b41e74a
    • Y
      memcgroup: fix spurious EBUSY on memory cgroup removal · 1d4a788f
      YAMAMOTO Takashi 提交于
      Call mm_free_cgroup earlier.  Otherwise a reference due to lazy mm switching
      can prevent cgroup removal.
      Signed-off-by: NYAMAMOTO Takashi <yamamoto@valinux.co.jp>
      Acked-by: NBalbir Singh <balbir@linux.vnet.ibm.com>
      Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
      Cc: Paul Menage <menage@google.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      1d4a788f
    • J
      in_atomic(): document why it is unsuitable for general use · 8c703d35
      Jonathan Corbet 提交于
      Discourage people from inappropriately using in_atomic()
      Signed-off-by: NJonathan Corbet <corbet@lwn.net>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8c703d35
    • A
      drivers/char/drm/ati_pcigart.c: fix printk warning · f67e74ca
      Andrew Morton 提交于
      drivers/char/drm/ati_pcigart.c: In function 'drm_ati_pcigart_init':
      drivers/char/drm/ati_pcigart.c:125: warning: format '%08X' expects type 'unsigned int', but argument 3 has type 'dma_addr_t'
      
      Cc: Dave Airlie <airlied@linux.ie>
      Cc: Randy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      f67e74ca
    • S
      mtd: nand: add out label in rfc_from4 · 6f5afaed
      Sebastian Siewior 提交于
      This has been forgotten in commit f5bbdacc ("[MTD] NAND Modularize
      read function") and nobody compiled the driver.
      Signed-off-by: NSebastian Siewior <bigeasy@linutronix.de>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: David Woodhouse <dwmw2@infradead.org>
      Cc: Joern Engel <joern@wh.fh-wedel.de>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      6f5afaed
    • A
      Avoid false positive warnings in kmap_atomic_prot() with DEBUG_HIGHMEM · 9c312058
      Andrew Morton 提交于
      I believe http://bugzilla.kernel.org/show_bug.cgi?id=10318 is a false
      positive.  There's no way in which networking will be using highmem pages
      here, so it won't be taking the KM_USER0 kmap slot, so there's no point in
      performing these checks.
      
      Cc: Pawel Staszewski <pstaszewski@artcom.pl>
      Cc: Ingo Molnar <mingo@elte.hu>
      Acked-by: NChristoph Lameter <clameter@sgi.com>
      Cc: "David S. Miller" <davem@davemloft.net>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
       [ Really sad.  We lose almost all real-life coverage of the debug tests
         with this patch. Now it will only report problems for the cases where
         people actually end up using a HIGHMEM page, not when they just _might_
         use one.    - Linus ]
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      9c312058
    • R
      RDMA/cxgb3: Program hardware IRD with correct value · 1f71f503
      Roland Dreier 提交于
      Because of a typo in iwch_accept_cr(), the cxgb3 connection handling
      code programs the hardware IRD (incoming RDMA read queue depth) with
      the value that is passed in for the ORD (outgoing RDMA read queue
      depth).  In particular this means that if an application passes in IRD
      > 0 and ORD = 0 (which is a completely sane and valid thing to do for
      an app that expects only incoming RDMA read requests), then the
      hardware will end up programmed with IRD = 0 and the app will fail in
      a mysterious way.
      
      Fix this by using "ep->ird" instead of "ep->ord" in the intended place.
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      Acked-by: NSteve Wise <swise@opengridcomputing.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      1f71f503
    • L
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · 8c178bee
      Linus Torvalds 提交于
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
        [POWERPC] Fix missed hardware breakpoints across multiple threads
      8c178bee
    • I
      revert "ACPI: drivers/acpi: elide a non-zero test on a result that is never 0" · 48d3d826
      Ingo Molnar 提交于
      Revert commit 1192aeb9 ("ACPI:
      drivers/acpi: elide a non-zero test on a result that is never 0")
      because it turns out that thermal_cooling_device_register() does
      actually return NULL if CONFIG_THERMAL is turned off (then the routine
      turns into a dummy inline routine in the header files that returns NULL
      unconditionally).
      
      This was found with randconfig testing, causing a crash during bootup:
      
        initcall 0x78878534 ran for 13 msecs: acpi_button_init+0x0/0x51()
        Calling initcall 0x78878585: acpi_fan_init+0x0/0x2c()
        BUG: unable to handle kernel NULL pointer dereference at 00000000
        IP: [<782b8ad0>] acpi_fan_add+0x7d/0xfd
        *pde = 00000000
        Oops: 0000 [#1]
        Modules linked in:
      
        Pid: 1, comm: swapper Not tainted (2.6.25-rc7-sched-devel.git-x86-latest.git #14)
        EIP: 0060:[<782b8ad0>] EFLAGS: 00010246 CPU: 0
        EIP is at acpi_fan_add+0x7d/0xfd
        EAX: b787c718 EBX: b787c400 ECX: b782ceb4 EDX: 00000007
        ESI: 00000000 EDI: b787c6f4 EBP: b782cee0 ESP: b782cecc
         DS: 007b ES: 007b FS: 0000 GS: 0000 SS: 0068
        Process swapper (pid: 1, ti=b782c000 task=b7846000 task.ti=b782c000)
        Stack: b787c459 00000000 b787c400 78790888 b787c60c b782cef8 782b6fb8 ffffffda
               b787c60c 00000000 78790958 b782cf0c 783005d7 b787c60c 78790958 78790584
               b782cf1c 783007f6 b782cf28 00000000 b782cf40 782ffc4a 78790958 b794d558
        Call Trace:
         [<782b6fb8>] ? acpi_device_probe+0x3e/0xdb
         [<783005d7>] ? driver_probe_device+0x82/0xfc
         [<783007f6>] ? __driver_attach+0x3a/0x70
         [<782ffc4a>] ? bus_for_each_dev+0x3e/0x60
         [<7830048c>] ? driver_attach+0x14/0x16
         [<783007bc>] ? __driver_attach+0x0/0x70
         [<7830006a>] ? bus_add_driver+0x9d/0x1b0
         [<783008c3>] ? driver_register+0x47/0xa3
         [<7813db00>] ? timespec_to_ktime+0x9/0xc
         [<782b7331>] ? acpi_bus_register_driver+0x3a/0x3c
         [<78878592>] ? acpi_fan_init+0xd/0x2c
         [<78863656>] ? kernel_init+0xac/0x1f9
         [<788635aa>] ? kernel_init+0x0/0x1f9
         [<78114563>] ? kernel_thread_helper+0x7/0x10
         =======================
        Code: 6e 78 e8 57 44 e7 ff 58 e9 93 00 00 00 8b 55 f0 8d bb f4 02 00 00 80 4b 2d 10 8b 03 e8 87 cb ff ff 8d 83 18 03 00 00 80 63 2d ef <ff> 35 00 00 00 00 50 68 e8 9c 6e 78 e8 22 44 e7 ff b9 b6 9c 6e
        EIP: [<782b8ad0>] acpi_fan_add+0x7d/0xfd SS:ESP 0068:b782cecc
        ---[ end trace 778e504de7e3b1e3 ]---
        Kernel panic - not syncing: Attempted to kill init!
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      Acked-by: NJulia Lawall <julia@diku.dk>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      48d3d826
  2. 28 3月, 2008 12 次提交
  3. 27 3月, 2008 10 次提交