19 Oct, 2007

2 commits


18 Oct, 2007

38 commits

  • * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
    [IA64] fix non-numa build

    Linus Torvalds
     
  • * '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

    Linus Torvalds
     
  • 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: Andrew Morton
    Signed-off-by: Tony Luck

    Andrew Morton
     
  • * '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

    Linus Torvalds
     
  • Add driver for Marvell's Libertas 8385 and 8686 wifi chips.

    Signed-off-by: Pierre Ossman
    Acked-by: Dan Williams

    Pierre Ossman
     
  • * 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
    ...

    Linus Torvalds
     
  • 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

    Signed-off-by: Sam Ravnborg
    Cc: Mike Galbraith
    Signed-off-by: Thomas Gleixner

    Sam Ravnborg
     
  • otherwise get the two copy file list in SRCARCH

    for cscope:
    C symbol: start_kernel

    File Function Line
    0 proto.h 11 extern void start_kernel(void );
    1 start_kernel.h 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 11 extern void start_kernel(void );
    1 start_kernel.h 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: Yinghai Lu
    Signed-off-by: Thomas Gleixner

    Yinghai Lu
     
  • 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: Eric Van Hensbergen

    Eric Van Hensbergen
     
  • 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: Andrew Victor
    Signed-off-by: Nicolas Ferre
    Signed-off-by: Pierre Ossman

    Andrew Victor
     
  • 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: Pierre Ossman

    Florin Malita
     
  • 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: Eric Van Hensbergen

    Eric Van Hensbergen
     
  • 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: Eric Van Hensbergen

    Eric Van Hensbergen
     
  • 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=)
    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: Latchesar Ionkov
    Signed-off-by: Eric Van Hensbergen

    Latchesar Ionkov
     
  • 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: Latchesar Ionkov
    Signed-off-by: Eric Van Hensbergen

    Latchesar Ionkov
     
  • Create more general flags field in the v9fs_session_info struct and move the
    'extended' flag as a bit in the flags.

    Signed-off-by: Latchesar Ionkov
    Signed-off-by: Eric Van Hensbergen

    Latchesar Ionkov
     
  • This patch abstracts out the interfaces to underlying transports so that
    new transports can be added as modules. This should also allow kernel
    configuration of transports without ifdef-hell.

    Signed-off-by: Eric Van Hensbergen

    Eric Van Hensbergen
     
  • Fix rebuild of kernel when there is no changes.
    This happened for i386.
    Using make V=2 hinted that the output files were
    not assigned to targets - fixed by this patch.

    Reported by: Boaz Harrosh

    Signed-off-by: Sam Ravnborg
    Signed-off-by: Thomas Gleixner

    Sam Ravnborg
     
  • This patch:
    - makes .gitignore files visible to git
    - makes arch/x86/kernel/vsyscall_32.lds and arch/i386/boot invisible

    Signed-off-by: Denis V. Lunev
    Signed-off-by: Thomas Gleixner

    Denis V. Lunev
     
  • * 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block:
    [BLOCK] blk_rq_map_sg() next_sg fixup
    Revert "[SCSI] Remove full sg table memset()"

    Linus Torvalds
     
  • Almost identical except for the extra DR_LEN_8 and the different
    DR_CONTROL_RESERVED defines.

    Signed-off-by: Thomas Gleixner

    Conflicts:

    include/asm-x86/Kbuild

    Thomas Gleixner
     
  • 32bit has an extra UNW_FP define, which does not hurt.

    Signed-off-by: Thomas Gleixner

    Thomas Gleixner
     
  • Mostly the same. Make the few exceptions conditional.

    Signed-off-by: Thomas Gleixner

    Conflicts:

    include/asm-x86/types_32.h

    Thomas Gleixner
     
  • Same file, except for whitespace, comment formatting.

    Signed-off-by: Thomas Gleixner

    Thomas Gleixner
     
  • Same file, except for the 64bit PREAMBLE_SIZE define.

    Signed-off-by: Thomas Gleixner

    Thomas Gleixner
     
  • Same file, except for whitespace, comment formatting and the
    .long/.quad delta which can be solved by a define.

    Signed-off-by: Thomas Gleixner

    Thomas Gleixner
     
  • Same file, except for the extra 64bit MAP_32BIT define, which does not hurt
    for 32 bit compiles.

    Signed-off-by: Thomas Gleixner

    Thomas Gleixner
     
  • The 32bit D(n) debug addon can be made exclusive for 32 bit compiles.
    Otherwise all the same.

    Signed-off-by: Thomas Gleixner

    Thomas Gleixner
     
  • The 64 bit variant has additional function prototypes which do no harm
    for 32 bit.

    Signed-off-by: Thomas Gleixner

    Thomas Gleixner
     
  • Same file, except for whitespace and comment formatting.

    Signed-off-by: Thomas Gleixner

    Thomas Gleixner
     
  • Same file, except for whitespace, comment formatting and:

    32-bit: if((unsigned int) addr >= (unsigned int) high_memory)
    64-bit: if((unsigned long) addr >= (unsigned long) high_memory)

    where the latter can be used safely for both.

    Signed-off-by: Thomas Gleixner

    Conflicts:
    include/asm-x86/floppy_32.h
    include/asm-x86/floppy_64.h

    Thomas Gleixner
     
  • commit 554d284ba90bc2306c31e5363789f05c320969c3 added _GPF_NORETRY
    to floppy_64.h to prevent OOM killer on floppy DMA allocations.

    Apply the same to the 32 bit variant.

    Found during the attempt to unify the _32/_64 variants. Seperate commit
    to document the resulting code change.

    Signed-off-by: Thomas Gleixner

    Thomas Gleixner
     
  • Same file, except for whitespace, comment formatting and the two variants
    of fb_is_primary_device()

    Signed-off-by: Thomas Gleixner

    Thomas Gleixner
     
  • Same file, except for whitespace, comment formatting and:

    32-bit: unsigned long *virt_addr = va;
    64-bit: unsigned int *virt_addr = va;

    Both can be safely replaced by:
    u32 i, *virt_addr = va;

    Signed-off-by: Thomas Gleixner

    Thomas Gleixner
     
  • Unification, so we have these things in one file.

    Signed-off-by: Thomas Gleixner

    Thomas Gleixner
     
  • Same file, except for whitespace, comment formatting and the extra
    function prototype usc_tsc_delay() in _32.

    Signed-off-by: Thomas Gleixner

    Thomas Gleixner
     
  • Same file, except for whitespace, comment formatting and the extra
    defines in _64, which are conditional on VSMP anyway.

    Signed-off-by: Thomas Gleixner

    Thomas Gleixner
     
  • Same file, except for whitespace, comment formatting and the extra
    DEBUG_PAGE_ALLOC function in _32.

    Signed-off-by: Thomas Gleixner

    Thomas Gleixner