1. 18 Oct, 2007 25 commits
  2. 17 Oct, 2007 15 commits
    • Linus Torvalds's avatar
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs · 9d8190f8
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
        9p: remove sysctl
        9p: fix bad kconfig cross-dependency
        9p: soften invalidation in loose_mode
        9p: attach-per-user
        9p: rename uid and gid parameters
        9p: define session flags
        9p: Make transports dynamic
      9d8190f8
    • Andrew Morton's avatar
      [IA64] fix non-numa build · 7259888e
      Andrew Morton authored
      arch/ia64/kernel/machine_kexec.c: In function `arch_crash_save_vmcoreinfo':
      arch/ia64/kernel/machine_kexec.c:131: error: `pgdat_list' undeclared (first use in this function)
      arch/ia64/kernel/machine_kexec.c:131: error: (Each undeclared identifier is reported only once
      arch/ia64/kernel/machine_kexec.c:131: error: for each function it appears in.)
      arch/ia64/kernel/machine_kexec.c:134: error: `node_memblk' undeclared (first use in this function)
      arch/ia64/kernel/machine_kexec.c:135: error: `NR_NODE_MEMBLKS' undeclared (first use in this function)
      arch/ia64/kernel/machine_kexec.c:136: error: invalid application of `sizeof' to incomplete type `node_memblk_s'
      arch/ia64/kernel/machine_kexec.c:137: error: dereferencing pointer to incomplete type
      arch/ia64/kernel/machine_kexec.c:138: error: dereferencing pointer to incomplete type
      make[1]: *** [arch/ia64/kernel/machine_kexec.o] Error 1
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      7259888e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc · c2f73fd0
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
        net: libertas sdio driver
        mmc: at91_mci: cleanup: use MCI_ERRORS
        mmc: possible leak in mmc_read_ext_csd
      c2f73fd0
    • Pierre Ossman's avatar
      net: libertas sdio driver · 727c26ed
      Pierre Ossman authored
      Add driver for Marvell's Libertas 8385 and 8686 wifi chips.
      Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
      Acked-by: default avatarDan Williams <dcbw@redhat.com>
      727c26ed
    • Linus Torvalds's avatar
      Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86 · d20ead9e
      Linus Torvalds authored
      * ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86: (114 commits)
        x86: delete vsyscall files during make clean
        kbuild: fix typo SRCARCH in find_sources
        x86: fix kernel rebuild due to vsyscall fallout
        .gitignore update for x86 arch
        x86: unify include/asm/debugreg_32/64.h
        x86: unify include/asm/unwind_32/64.h
        x86: unify include/asm/types_32/64.h
        x86: unify include/asm/tlb_32/64.h
        x86: unify include/asm/siginfo_32/64.h
        x86: unify include/asm/bug_32/64.h
        x86: unify include/asm/mman_32/64.h
        x86: unify include/asm/agp_32/64.h
        x86: unify include/asm/kdebug_32/64.h
        x86: unify include/asm/ioctls_32/64.h
        x86: unify include/asm/floppy_32/64.h
        x86: apply missing DMA/OOM prevention to floppy_32.h
        x86: unify include/asm/cache_32/64.h
        x86: unify include/asm/cache_32/64.h
        x86: unify include/asm/dmi_32/64.h
        x86: unify include/asm/delay_32/64.h
        ...
      d20ead9e
    • Sam Ravnborg's avatar
      x86: delete vsyscall files during make clean · 88e4d250
      Sam Ravnborg authored
      make clean failed to delete a few files in
      x86/kernel. This is because kbuild does not
      see the correct/full kernel/Makefile.
      
      As a workaround until the Makefiles are merged specify
      the files to be deleted in the common Makefile.
      
      Reported by Mike Galbraith <efault@gmx.de>
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      Cc: Mike Galbraith <efault@gmx.de>
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      88e4d250
    • Yinghai Lu's avatar
      kbuild: fix typo SRCARCH in find_sources · f8bea58b
      Yinghai Lu authored
      otherwise get the two copy file list in SRCARCH
      
      for cscope:
      C symbol: start_kernel
      
        File           Function            Line
      0 proto.h        <global>              11 extern void start_kernel(void );
      1 start_kernel.h <global>              10 extern asmlinkage void __init start_kernel(void );
      2 head32.c       i386_start_kernel     37 start_kernel();
      3 head32.c       i386_start_kernel     37 start_kernel();
      4 head64.c       x86_64_start_kernel   85 start_kernel();
      5 head64.c       x86_64_start_kernel   85 start_kernel();
      6 head_32.S      options              199 cmpb $0,%cl #the first CPU calls start_kernel
      7 head_32.S      options              199 cmpb $0,%cl #the first CPU calls start_kernel
      8 enlighten.c    xen_start_kernel    1145 start_kernel();
      9 enlighten.c    xen_start_kernel    1145 start_kernel();
      a lguest.c       lguest_init         1095 start_kernel();
      b main.c         start_kernel         513 asmlinkage void __init start_kernel(void )
      
      after the patch:
      C symbol: start_kernel
      
        File           Function            Line
      0 proto.h        <global>              11 extern void start_kernel(void );
      1 start_kernel.h <global>              10 extern asmlinkage void __init start_kernel(void );
      2 head32.c       i386_start_kernel     37 start_kernel();
      3 head64.c       x86_64_start_kernel   85 start_kernel();
      4 head_32.S      options              199 cmpb $0,%cl #the first CPU calls start_kernel
      5 enlighten.c    xen_start_kernel    1145 start_kernel();
      6 lguest.c       lguest_init         1095 start_kernel();
      7 main.c         start_kernel         513 asmlinkage void __init start_kernel(void )
      Signed-off-by: default avatarYinghai Lu <yinghai.lu@sun.com>
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      f8bea58b
    • Eric Van Hensbergen's avatar
      9p: remove sysctl · 982c37cf
      Eric Van Hensbergen authored
      A sysctl method was added to enable and disable debugging levels.  After
      further review, it was decided that there are better approaches to doing this
      and the sysctl methodology isn't really desirable.  This patch removes the
      sysctl code from 9p.
      Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
        
      982c37cf
    • Andrew Victor's avatar
      mmc: at91_mci: cleanup: use MCI_ERRORS · 9e3866b5
      Andrew Victor authored
      A small MMC driver cleanup.
      
      Use the defined AT91_MCI_ERRORS in at91_mci_completed_command() instead
      of specifying all the error bits individually.
      Signed-off-by: default avatarAndrew Victor <andrew@sanpeople.com>
      Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
      Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
      9e3866b5
    • Florin Malita's avatar
      mmc: possible leak in mmc_read_ext_csd · 00cedfa6
      Florin Malita authored
      The exception path associated with an invalid ext_csd_struct returns
      without freeing ext_csd.
      
      Coverity CID 1909.
      
      Signed-off-by: Florin Malita
      Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
      00cedfa6
    • Eric Van Hensbergen's avatar
      9p: fix bad kconfig cross-dependency · fb0466c3
      Eric Van Hensbergen authored
      This patch moves transport dynamic registration and matching to the net
      module to prevent a bad Kconfig dependency between the net and fs 9p modules.
      Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
      fb0466c3
    • Eric Van Hensbergen's avatar
      9p: soften invalidation in loose_mode · 50fd8010
      Eric Van Hensbergen authored
      Loose mode in 9p utilizes the page cache without respecting coherency with
      the server.  Any writes previously invaldiated the entire mapping for a file.
      This patch softens the behavior to only invalidate the region of the actual
      write.
      Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
      50fd8010
    • Latchesar Ionkov's avatar
      9p: attach-per-user · ba17674f
      Latchesar Ionkov authored
      The 9P2000 protocol requires the authentication and permission checks to be
      done in the file server. For that reason every user that accesses the file
      server tree has to authenticate and attach to the server separately.
      Multiple users can share the same connection to the server.
      
      Currently v9fs does a single attach and executes all I/O operations as a
      single user. This makes using v9fs in multiuser environment unsafe as it
      depends on the client doing the permission checking.
      
      This patch improves the 9P2000 support by allowing every user to attach
      separately. The patch defines three modes of access (new mount option
      'access'):
      
      - attach-per-user (access=user) (default mode for 9P2000.u)
       If a user tries to access a file served by v9fs for the first time, v9fs
       sends an attach command to the server (Tattach) specifying the user. If
       the attach succeeds, the user can access the v9fs tree.
       As there is no uname->uid (string->integer) mapping yet, this mode works
       only with the 9P2000.u dialect.
      
      - allow only one user to access the tree (access=<uid>)
       Only the user with uid can access the v9fs tree. Other users that attempt
       to access it will get EPERM error.
      
      - do all operations as a single user (access=any) (default for 9P2000)
       V9fs does a single attach and all operations are done as a single user.
       If this mode is selected, the v9fs behavior is identical with the current
       one.
      Signed-off-by: default avatarLatchesar Ionkov <lucho@ionkov.net>
      Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
      ba17674f
    • Latchesar Ionkov's avatar
      9p: rename uid and gid parameters · bd32b82d
      Latchesar Ionkov authored
      Change the names of 'uid' and 'gid' parameters to the more appropriate
      'dfltuid' and 'dfltgid'.  This also sets the default uid/gid to -2
      (aka nfsnobody)
      Signed-off-by: default avatarLatchesar Ionkov <lucho@ionkov.net>
      Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
      bd32b82d