1. 15 7月, 2008 18 次提交
    • L
      x86: MMIOTRACE should not default to on · 116a9fb3
      Linus Torvalds 提交于
      Even the help-text makes it clear that normal people shouldn't enable
      it.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      116a9fb3
    • L
      Merge branch 'core/locking' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 40e7babb
      Linus Torvalds 提交于
      * 'core/locking' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        lockdep: fix kernel/fork.c warning
        lockdep: fix ftrace irq tracing false positive
        lockdep: remove duplicate definition of STATIC_LOCKDEP_MAP_INIT
        lockdep: add lock_class information to lock_chain and output it
        lockdep: add lock_class information to lock_chain and output it
        lockdep: output lock_class key instead of address for forward dependency output
        __mutex_lock_common: use signal_pending_state()
        mutex-debug: check mutex magic before owner
      
      Fixed up conflict in kernel/fork.c manually
      40e7babb
    • L
      Merge branch 'sched/new-API-sched_setscheduler' of... · 948769a5
      Linus Torvalds 提交于
      Merge branch 'sched/new-API-sched_setscheduler' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'sched/new-API-sched_setscheduler' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        sched: add new API sched_setscheduler_nocheck: add a flag to control access checks
      948769a5
    • L
      Merge branch 'tracing/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · e18425a0
      Linus Torvalds 提交于
      * 'tracing/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (228 commits)
        ftrace: build fix for ftraced_suspend
        ftrace: separate out the function enabled variable
        ftrace: add ftrace_kill_atomic
        ftrace: use current CPU for function startup
        ftrace: start wakeup tracing after setting function tracer
        ftrace: check proper config for preempt type
        ftrace: trace schedule
        ftrace: define function trace nop
        ftrace: move sched_switch enable after markers
        ftrace: prevent ftrace modifications while being kprobe'd, v2
        fix "ftrace: store mcount address in rec->ip"
        mmiotrace broken in linux-next (8-bit writes only)
        ftrace: avoid modifying kprobe'd records
        ftrace: freeze kprobe'd records
        kprobes: enable clean usage of get_kprobe
        ftrace: store mcount address in rec->ip
        ftrace: build fix with gcc 4.3
        namespacecheck: fixes
        ftrace: fix "notrace" filtering priority
        ftrace: fix printout
        ...
      e18425a0
    • L
      Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6 · d1794f2c
      Linus Torvalds 提交于
      * 'bkl-removal' of git://git.lwn.net/linux-2.6: (146 commits)
        IB/umad: BKL is not needed for ib_umad_open()
        IB/uverbs: BKL is not needed for ib_uverbs_open()
        bf561-coreb: BKL unneeded for open()
        Call fasync() functions without the BKL
        snd/PCM: fasync BKL pushdown
        ipmi: fasync BKL pushdown
        ecryptfs: fasync BKL pushdown
        Bluetooth VHCI: fasync BKL pushdown
        tty_io: fasync BKL pushdown
        tun: fasync BKL pushdown
        i2o: fasync BKL pushdown
        mpt: fasync BKL pushdown
        Remove BKL from remote_llseek v2
        Make FAT users happier by not deadlocking
        x86-mce: BKL pushdown
        vmwatchdog: BKL pushdown
        vmcp: BKL pushdown
        via-pmu: BKL pushdown
        uml-random: BKL pushdown
        uml-mmapper: BKL pushdown
        ...
      d1794f2c
    • J
      Merge commit 'v2.6.26' into bkl-removal · 2fceef39
      Jonathan Corbet 提交于
      2fceef39
    • S
      ftrace: document updates · a41eebab
      Steven Rostedt 提交于
      The following updates were recommended by Elias Oltmanns and Randy Dunlap.
      
      [ updates based on Andrew Morton's comments are still to come. ]
      Signed-off-by: NSteven Rostedt <srostedt@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      a41eebab
    • L
      Merge branch 'sched/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 17489c05
      Linus Torvalds 提交于
      * 'sched/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (76 commits)
        sched_clock: and multiplier for TSC to gtod drift
        sched_clock: record TSC after gtod
        sched_clock: only update deltas with local reads.
        sched_clock: fix calculation of other CPU
        sched_clock: stop maximum check on NO HZ
        sched_clock: widen the max and min time
        sched_clock: record from last tick
        sched: fix accounting in task delay accounting & migration
        sched: add avg-overlap support to RT tasks
        sched: terminate newidle balancing once at least one task has moved over
        sched: fix warning
        sched: build fix
        sched: sched_clock_cpu() based cpu_clock(), lockdep fix
        sched: export cpu_clock
        sched: make sched_{rt,fair}.c ifdefs more readable
        sched: bias effective_load() error towards failing wake_affine().
        sched: incremental effective_load()
        sched: correct wakeup weight calculations
        sched: fix mult overflow
        sched: update shares on wakeup
        ...
      17489c05
    • L
      Merge branch 'x86/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · a3da5bf8
      Linus Torvalds 提交于
      * 'x86/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (821 commits)
        x86: make 64bit hpet_set_mapping to use ioremap too, v2
        x86: get x86_phys_bits early
        x86: max_low_pfn_mapped fix #4
        x86: change _node_to_cpumask_ptr to return const ptr
        x86: I/O APIC: remove an IRQ2-mask hack
        x86: fix numaq_tsc_disable calling
        x86, e820: remove end_user_pfn
        x86: max_low_pfn_mapped fix, #3
        x86: max_low_pfn_mapped fix, #2
        x86: max_low_pfn_mapped fix, #1
        x86_64: fix delayed signals
        x86: remove conflicting nx6325 and nx6125 quirks
        x86: Recover timer_ack lost in the merge of the NMI watchdog
        x86: I/O APIC: Never configure IRQ2
        x86: L-APIC: Always fully configure IRQ0
        x86: L-APIC: Set IRQ0 as edge-triggered
        x86: merge dwarf2 headers
        x86: use AS_CFI instead of UNWIND_INFO
        x86: use ignore macro instead of hash comment
        x86: use matching CFI_ENDPROC
        ...
      a3da5bf8
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 3b23e665
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (50 commits)
        crypto: ixp4xx - Select CRYPTO_AUTHENC
        crypto: s390 - Respect STFL bit
        crypto: talitos - Add support for sha256 and md5 variants
        crypto: hash - Move ahash functions into crypto/hash.h
        crypto: crc32c - Add ahash implementation
        crypto: hash - Added scatter list walking helper
        crypto: prng - Deterministic CPRNG
        crypto: hash - Removed vestigial ahash fields
        crypto: hash - Fixed digest size check
        crypto: rmd - sparse annotations
        crypto: rmd128 - sparse annotations
        crypto: camellia - Use kernel-provided bitops, unaligned access helpers
        crypto: talitos - Use proper form for algorithm driver names
        crypto: talitos - Add support for 3des
        crypto: padlock - Make module loading quieter when hardware isn't available
        crypto: tcrpyt - Remove unnecessary kmap/kunmap calls
        crypto: ixp4xx - Hardware crypto support for IXP4xx CPUs
        crypto: talitos - Freescale integrated security engine (SEC) driver
        [CRYPTO] tcrypt: Add self test for des3_ebe cipher operating in cbc mode
        [CRYPTO] rmd: Use pointer form of endian swapping operations
        ...
      3b23e665
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 · 6c118e43
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6: (31 commits)
        avr32: Fix typo of IFSR in a comment in the PIO header file
        avr32: Power Management support ("standby" and "mem" modes)
        avr32: Add system device for the internal interrupt controller (intc)
        avr32: Add simple SRAM allocator
        avr32: Enable SDRAMC clock at startup
        rtc-at32ap700x: Enable wakeup
        macb: Basic suspend/resume support
        atmel_serial: Drain console TX shifter before suspending
        atmel_serial: Fix build on avr32 with CONFIG_PM enabled
        avr32: Use a quicklist for PTE allocation as well
        avr32: Use a quicklist for PGD allocation
        avr32: Cover the kernel page tables in the user PGDs
        avr32: Store virtual addresses in the PGD
        avr32: Remove useless zeroing of swapper_pg_dir at startup
        avr32: Clean up and optimize the TLB operations
        avr32: Rename at32ap.c -> pdc.c
        avr32: Move setup_platform() into chip-specific file
        avr32: Kill special exception handler sections
        avr32: Kill unneeded #include <asm/pgalloc.h> from asm/mmu_context.h
        avr32: Clean up time.c #includes
        ...
      6c118e43
    • L
      Merge branch 'for-linus' of... · 847106ff
      Linus Torvalds 提交于
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (25 commits)
        security: remove register_security hook
        security: remove dummy module fix
        security: remove dummy module
        security: remove unused sb_get_mnt_opts hook
        LSM/SELinux: show LSM mount options in /proc/mounts
        SELinux: allow fstype unknown to policy to use xattrs if present
        security: fix return of void-valued expressions
        SELinux: use do_each_thread as a proper do/while block
        SELinux: remove unused and shadowed addrlen variable
        SELinux: more user friendly unknown handling printk
        selinux: change handling of invalid classes (Was: Re: 2.6.26-rc5-mm1 selinux whine)
        SELinux: drop load_mutex in security_load_policy
        SELinux: fix off by 1 reference of class_to_string in context_struct_compute_av
        SELinux: open code sidtab lock
        SELinux: open code load_mutex
        SELinux: open code policy_rwlock
        selinux: fix endianness bug in network node address handling
        selinux: simplify ioctl checking
        SELinux: enable processes with mac_admin to get the raw inode contexts
        Security: split proc ptrace checking into read vs. attach
        ...
      847106ff
    • L
      Merge branch 'drm-reorg' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · c142bda4
      Linus Torvalds 提交于
      * 'drm-reorg' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
        drm: reorganise drm tree to be more future proof.
      c142bda4
    • L
      Merge branch 'for-linus' of git://git.alsa-project.org/alsa-kernel · b5cf43c4
      Linus Torvalds 提交于
      * 'for-linus' of git://git.alsa-project.org/alsa-kernel: (179 commits)
        ALSA: Release v1.0.17
        ALSA: correct kcalloc usage
        ALSA: ALSA driver for SGI O2 audio board
        ALSA: asoc: kbuild - only show menus for the current ASoC CPU platform.
        ALSA: ALSA driver for SGI HAL2 audio device
        ALSA: hda - Fix FSC V5505 model
        ALSA: hda - Fix missing init for unsol events on micsense model
        ALSA: hda - Fix internal mic vref pin setup
        ALSA: hda: 92hd71bxx PC Beep
        ALSA: HDA - HP dc7600 with pci sub IDs 0x103c/0x3011 belongs to hp-3013 model
        ALSA: usb-audio: add some Yamaha USB MIDI quirks
        ALSA: usb-audio: fix Yamaha KX quirk
        ALSA: ASoC: Au12x0/Au1550 PSC Audio support
        ALSA: Add Yamaha KX49 (USB MIDI controller) to usbquirks.h
        ALSA: ASoC: pxa2xx-ac97: fix warning due to missing argument in fuction declaration
        ALSA: tosa: fix compilation with new DAPM API
        ALSA: wavefront - add const
        ALSA: remove CONFIG_KMOD from sound
        ALSA: Fix a const to non-const assignment in the Digigram VXpocket sound driver
        ALSA: Fix a const pointer usage warning in the Digigram VX soundcard driver
        ...
      b5cf43c4
    • L
      Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 · b7f80afa
      Linus Torvalds 提交于
      * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (71 commits)
        [S390] sclp_tty: Fix scheduling while atomic bug.
        [S390] sclp_tty: remove ioctl interface.
        [S390] Remove P390 support.
        [S390] Cleanup vmcp printk messages.
        [S390] Cleanup lcs printk messages.
        [S390] Cleanup kprobes printk messages.
        [S390] Cleanup vmwatch printk messages.
        [S390] Cleanup dcssblk printk messages.
        [S390] Cleanup zfcp dumper printk messages.
        [S390] Cleanup vmlogrdr printk messages.
        [S390] Cleanup s390 debug feature print messages.
        [S390] Cleanup monreader printk messages.
        [S390] Cleanup appldata printk messages.
        [S390] Cleanup smsgiucv printk messages.
        [S390] Cleanup cpacf printk messages.
        [S390] Cleanup qeth print messages.
        [S390] Cleanup netiucv printk messages.
        [S390] Cleanup iucv printk messages.
        [S390] Cleanup sclp printk messages.
        [S390] Cleanup zcrypt printk messages.
        ...
      b7f80afa
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 · 42c59208
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (23 commits)
        pcmcia: Fix ide-cs sparse warning
        pcmcia: ide-cs debugging bugfix
        pcmcia: allow for longer CIS firmware files
        pcmcia: cm40x0 cdev lock_kernel() pushdown
        pcmcia: (re)move {pcmcia,pccard}_get_status
        pcmcia: kill IN_CARD_SERVICES
        pcmcia: Remove unused header file code
        pcmcia: remove unused bulkmem.h
        pcmcia: simplify pccard_validate_cis
        pcmcia: carve out ioctl adjust function to pcmcia_ioctl
        pcmcia: irq probe can be done without risking an IRQ storm
        pcmcia: Fix ti12xx_2nd_slot_empty always failing
        pcmcia: check for pointer instead of pointer address
        pcmcia: switch cm4000_cs.c to unlocked_ioctl
        pcmcia: simplify rsrc_nonstatic attributes
        pcmcia: add support CompactFlash PCMCIA support for Blackfin.
        pcmcia: remove version.h
        pcmcia: cs: kill thread_wait
        pcmcia: i82365.c: check request_irq return value
        pcmcia: fix Alchemy warnings
        ...
      42c59208
    • L
      Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block · dddec01e
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.dk/linux-2.6-block: (37 commits)
        splice: fix generic_file_splice_read() race with page invalidation
        ramfs: enable splice write
        drivers/block/pktcdvd.c: avoid useless memset
        cdrom: revert commit 22a9189f (cdrom: use kmalloced buffers instead of buffers on stack)
        scsi: sr avoids useless buffer allocation
        block: blk_rq_map_kern uses the bounce buffers for stack buffers
        block: add blk_queue_update_dma_pad
        DAC960: push down BKL
        pktcdvd: push BKL down into driver
        paride: push ioctl down into driver
        block: use get_unaligned_* helpers
        block: extend queue_flag bitops
        block: request_module(): use format string
        Add bvec_merge_data to handle stacked devices and ->merge_bvec()
        block: integrity flags can't use bit ops on unsigned short
        cmdfilter: extend default read filter
        sg: fix odd style (extra parenthesis) introduced by cmd filter patch
        block: add bounce support to blk_rq_map_user_iov
        cfq-iosched: get rid of enable_idle being unused warning
        allow userspace to modify scsi command filter on per device basis
        ...
      dddec01e
    • L
      Start using the new '%pS' infrastructure to print symbols · 7daf705f
      Linus Torvalds 提交于
      This simplifies the code significantly, and was the whole point of the
      exercise.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      7daf705f
  2. 14 7月, 2008 22 次提交