1. 19 4月, 2008 23 次提交
  2. 18 4月, 2008 17 次提交
    • L
      Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 · 253ba4e7
      Linus Torvalds 提交于
      * 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6: (87 commits)
        [XFS] Fix merge failure
        [XFS] The forward declarations for the xfs_ioctl() helpers and the
        [XFS] Update XFS documentation for noikeep/ikeep.
        [XFS] Update XFS Documentation for ikeep and ihashsize
        [XFS] Remove unused HAVE_SPLICE macro.
        [XFS] Remove CONFIG_XFS_SECURITY.
        [XFS] xfs_bmap_compute_maxlevels should be based on di_forkoff
        [XFS] Always use di_forkoff when checking for attr space.
        [XFS] Ensure the inode is joined in xfs_itruncate_finish
        [XFS] Remove periodic logging of in-core superblock counters.
        [XFS] fix logic error in xfs_alloc_ag_vextent_near()
        [XFS] Don't error out on good I/Os.
        [XFS] Catch log unmount failures.
        [XFS] Sanitise xfs_log_force error checking.
        [XFS] Check for errors when changing buffer pointers.
        [XFS] Don't allow silent errors in xfs_inactive().
        [XFS] Catch errors from xfs_imap().
        [XFS] xfs_bulkstat_one_dinode() never returns an error.
        [XFS] xfs_iflush_fork() never returns an error.
        [XFS] Catch unwritten extent conversion errors.
        ...
      253ba4e7
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 · 188da988
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (58 commits)
        ide: remove ide_init_default_irq() macro
        ide: move default IDE ports setup to ide_generic host driver
        ide: remove obsoleted "idex=noprobe" kernel parameter (take 2)
        ide: remove needless hwif->irq check from ide_hwif_configure()
        ide: init hwif->{io_ports,irq} explicitly in legacy VLB host drivers
        ide: limit legacy VLB host drivers to alpha, x86 and mips
        cmd640: init hwif->{io_ports,irq} explicitly
        cmd640: cleanup setup_device_ptrs()
        ide: add ide-4drives host driver (take 3)
        ide: remove ppc ifdef from init_ide_data()
        ide: remove ide_default_io_ctl() macro
        ide: remove CONFIG_IDE_ARCH_OBSOLETE_INIT
        ide: add CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS (take 2)
        ppc/pmac: remove no longer needed IDE quirk
        ppc: don't include <linux/ide.h>
        ppc: remove ppc_ide_md
        ppc/pplus: remove ppc_ide_md.ide_init_hwif hook
        ppc/sandpoint: remove ppc_ide_md hooks
        ppc/lopec: remove ppc_ide_md hooks
        ppc/mpc8xx: remove ppc_ide_md hooks
        ...
      188da988
    • L
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx · 07fe944e
      Linus Torvalds 提交于
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
        dmaengine: ack to flags: make use of the unused bits in the 'ack' field
        iop-adma: remove the workaround for missed interrupts on iop3xx
        async_tx: kill ->device_dependency_added
        async_tx: fix multiple dependency submission
        fsldma: Split the MPC83xx event from MPC85xx and refine irq codes.
        fsldma: Remove CONFIG_FSL_DMA_SELFTEST, keep fsl_dma_self_test() running always.
      07fe944e
    • L
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · 8019aa94
      Linus Torvalds 提交于
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (79 commits)
        ata-acpi: don't call _GTF for disabled drive
        sata_mv add temporary 3 second init delay for SiliconImage PMs
        sata_mv remove redundant edma init code
        sata_mv add basic port multiplier support
        sata_mv fix SOC flags, enable NCQ on SOC
        sata_mv disable hotplug for now
        sata_mv cosmetics
        sata_mv hardreset rework
        [libata] improve Kconfig help text for new PMP, SFF options
        libata: make EH fail gracefully if no reset method is available
        libata: Be a bit more slack about early devices
        libata: cable logic
        libata: move link onlineness check out of softreset methods
        libata: kill dead code paths in reset path
        pata_scc: fix build breakage
        libata: make PMP support optional
        libata: implement PMP helpers
        libata: separate PMP support code from core code
        libata: make SFF support optional
        libata: don't use ap->ioaddr in non-SFF drivers
        ...
      8019aa94
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt · 73e3e648
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
        clocksource: make clocksource watchdog cycle through online CPUs
        Documentation: move timer related documentation to a single place
        clockevents: optimise tick_nohz_stop_sched_tick() a bit
        locking: remove unused double_spin_lock()
        hrtimers: simplify lockdep handling
        timers: simplify lockdep handling
        posix-timers: fix shadowed variables
        timer_list: add annotations to workqueue.c
        hrtimer: use nanosleep specific restart_block fields
        hrtimer: add nanosleep specific restart_block member
      73e3e648
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6 · 4adeaaf5
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
        jfs: replace __inline with inline
        jfs: le*_add_cpu conversion
      4adeaaf5
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-kgdb · 9732b611
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-kgdb:
        kgdb: always use icache flush for sw breakpoints
        kgdb: fix SMP NMI kgdb_handle_exception exit race
        kgdb: documentation fixes
        kgdb: allow static kgdbts boot configuration
        kgdb: add documentation
        kgdb: Kconfig fix
        kgdb: add kgdb internal test suite
        kgdb: fix several kgdb regressions
        kgdb: kgdboc pl011 I/O module
        kgdb: fix optional arch functions and probe_kernel_*
        kgdb: add x86 HW breakpoints
        kgdb: print breakpoint removed on exception
        kgdb: clocksource watchdog
        kgdb: fix NMI hangs
        kgdb: fix kgdboc dynamic module configuration
        kgdb: document parameters
        x86: kgdb support
        consoles: polling support, kgdboc
        kgdb: core
        uaccess: add probe_kernel_write()
      9732b611
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 · 9e9abecf
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: (613 commits)
        x86: standalone trampoline code
        x86: move suspend wakeup code to C
        x86: coding style fixes to arch/x86/kernel/acpi/sleep.c
        x86: setup_trampoline() - fix section mismatch warning
        x86: section mismatch fixes, #1
        x86: fix paranoia about using BIOS quickboot mechanism.
        x86: print out buggy mptable
        x86: use cpu_online()
        x86: use cpumask_of_cpu()
        x86: remove unnecessary tmp local variable
        x86: remove unnecessary memset()
        x86: use ioapic_read_entry() and ioapic_write_entry()
        x86: avoid redundant loop in io_apic_level_ack_pending()
        x86: remove superfluous initialisation in boot code.
        x86: merge mpparse_{32,64}.c
        x86: unify mp_register_gsi
        x86: unify mp_config_acpi_legacy_irqs
        x86: unify mp_register_ioapic
        x86: unify uniq_io_apic_id
        x86: unify smp_scan_config
        ...
      9e9abecf
    • L
      Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc · d7bb545d
      Linus Torvalds 提交于
      * 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc:
        Remove DEBUG_SEMAPHORE from Kconfig
        Improve semaphore documentation
        Simplify semaphore implementation
        Add down_timeout and change ACPI to use it
        Introduce down_killable()
        Generic semaphore implementation
        Add semaphore.h to kernel_lock.c
        Fix quota.h includes
      d7bb545d
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 75e98b34
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (104 commits)
        IB/iser: Don't change itt endianness
        IB/mlx4: Update module version and release date
        IPoIB: Handle case when P_Key is deleted and re-added at same index
        IB/iser: Release connection resources on RDMA_CM_EVENT_DEVICE_REMOVAL event
        IB/mlx4: Fix incorrect comment
        IB/mlx4: Fix race when detaching a QP from a multicast group
        IB/ehca: Support all ibv_devinfo values in query_device() and query_port()
        RDMA/nes: Free IRQ before killing tasklet
        IB/mthca: Update module version and release date
        IB/mlx4: Update QP state if query QP succeeds
        IB/mthca: Update QP state if query QP succeeds
        RDMA/amso1100: Add check for NULL reply_msg in c2_intr()
        IB/mlx4: Add support for resizing CQs
        IB/mlx4: Add support for modifying CQ moderation parameters
        IPoIB: Support modifying IPoIB CQ event moderation
        IB/core: Add support for modify CQ
        IPoIB: Add basic ethtool support
        mlx4_core: Increase max number of QPs to 128K
        RDMA/amso1100: Add support for "send with invalidate" work requests
        IB/core: Add support for "send with invalidate" work requests
        ...
      75e98b34
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6 · 30bc9456
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
        security: enhance DEFAULT_MMAP_MIN_ADDR description
        SELinux: add netport.[ch]
        SELinux: Add network port SID cache
        SELinux: turn mount options strings into defines
        selinux/ss/services.c should #include <linux/selinux.h>
        selinux: introduce permissive types
        selinux: remove ptrace_sid
        SELinux: requesting no permissions in avc_has_perm_noaudit is a BUG()
        security: code cleanup
        security: replace remaining __FUNCTION__ occurrences
        SELinux: create new open permission
        selinux: selinux/netlabel.c should #include "netlabel.h"
        SELinux: unify printk messages
        SELinux: remove unused backpointers from security objects
        SELinux: Correct the NetLabel locking for the sk_security_struct
      30bc9456
    • L
      Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 · 4cba84b5
      Linus Torvalds 提交于
      * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (36 commits)
        [S390] Remove code duplication from monreader / dcssblk.
        [S390] kernel: show last breaking-event-address on oops
        [S390] lowcore: Change type of lowcores softirq_pending to __u32.
        [S390] zcrypt: Comments and kernel-doc cleanup
        [S390] uaccess: Always access the correct address space.
        [S390] Fix a lot of sparse warnings.
        [S390] Convert s390 to GENERIC_CLOCKEVENTS.
        [S390] genirq/clockevents: move irq affinity prototypes/inlines to interrupt.h
        [S390] Convert monitor calls to function calls.
        [S390] qdio (new feature): enhancing info-retrieval from QDIO-adapters
        [S390] replace remaining __FUNCTION__ occurrences
        [S390] remove redundant display of free swap space in show_mem()
        [S390] qdio: remove outdated developerworks link.
        [S390] Add debug_register_mode() function to debug feature API
        [S390] crypto: use more descriptive function names for init/exit routines.
        [S390] switch sched_clock to store-clock-extended.
        [S390] zcrypt: add support for large random numbers
        [S390] hw_random: allow rng_dev_read() to return hardware errors.
        [S390] Vertical cpu management.
        [S390] cpu topology support for s390.
        ...
      4cba84b5
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 · 7d939fbd
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
        slub: No need for per node slab counters if !SLUB_DEBUG
        slub: Move map/flag clearing to __free_slab
        slub: Fixes to per cpu stat output in sysfs
        slub: Deal with config variable dependencies
        slub: Reduce #ifdef ZONE_DMA by moving kmalloc_caches_dma near dma logic
        slub: Initialize per-cpu stats
      7d939fbd
    • R
      ptrace_signal subroutine · 18c98b65
      Roland McGrath 提交于
      This breaks out the ptrace handling from get_signal_to_deliver into a
      new subroutine.  The actual code there doesn't change, and it gets
      inlined into nearly identical compiled code.  This makes the function
      substantially shorter and thus easier to read, and it nicely isolates
      the ptrace magic.
      Signed-off-by: NRoland McGrath <roland@redhat.com>
      Acked-by: NKyle McMartin <kyle@mcmartin.ca>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      18c98b65
    • L
      cgroup: fix a race condition in manipulating tsk->cg_list · 0e04388f
      Li Zefan 提交于
      When I ran a test program to fork mass processes and at the same time
      'cat /cgroup/tasks', I got the following oops:
      
        ------------[ cut here ]------------
        kernel BUG at lib/list_debug.c:72!
        invalid opcode: 0000 [#1] SMP
        Pid: 4178, comm: a.out Not tainted (2.6.25-rc9 #72)
        ...
        Call Trace:
         [<c044a5f9>] ? cgroup_exit+0x55/0x94
         [<c0427acf>] ? do_exit+0x217/0x5ba
         [<c0427ed7>] ? do_group_exit+0.65/0x7c
         [<c0427efd>] ? sys_exit_group+0xf/0x11
         [<c0404842>] ? syscall_call+0x7/0xb
         [<c05e0000>] ? init_cyrix+0x2fa/0x479
        ...
        EIP: [<c04df671>] list_del+0x35/0x53 SS:ESP 0068:ebc7df4
        ---[ end trace caffb7332252612b ]---
        Fixing recursive fault but reboot is needed!
      
      After digging into the code and debugging, I finlly found out a race
      situation:
      
      				do_exit()
      				  ->cgroup_exit()
      				    ->if (!list_empty(&tsk->cg_list))
      				        list_del(&tsk->cg_list);
      
        cgroup_iter_start()
          ->cgroup_enable_task_cg_list()
            ->list_add(&tsk->cg_list, ..);
      
      In this case the list won't be deleted though the process has exited.
      
      We got two bug reports in the past, which seem to be the same bug as
      this one:
      	http://lkml.org/lkml/2008/3/5/332
      	http://lkml.org/lkml/2007/10/17/224
      
      Actually sometimes I got oops on list_del, sometimes oops on list_add.
      And I can change my test program a bit to trigger other oops.
      
      The patch has been tested both on x86_32 and x86_64.
      Signed-off-by: NLi Zefan <lizf@cn.fujitsu.com>
      Acked-by: NPaul Menage <menage@google.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: stable@kernel.org
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      0e04388f
    • M
      security: enhance DEFAULT_MMAP_MIN_ADDR description · 5f46ce14
      maximilian attems 提交于
      Got burned by setting the proposed default of 65536
      across all Debian archs.
      
      Thus proposing to be more specific on which archs you may
      set this. Also propose a value for arm and friends that
      doesn't break sshd.
      
      Reword to mention working archs ia64 and ppc64 too.
      Signed-off-by: Nmaximilian attems <max@stro.at>
      Cc: Martin Michlmayr <tbm@cyrius.com>
      Cc: Gordon Farquharson <gordonfarquharson@gmail.com>
      Acked-by: NEric Paris <eparis@redhat.com>
      Signed-off-by: NJames Morris <jmorris@namei.org>
      5f46ce14
    • J
      SELinux: add netport.[ch] · 27cc2a6e
      James Morris 提交于
      Thank you, git.
      Signed-off-by: NJames Morris <jmorris@namei.org>
      27cc2a6e