21 May, 2011

3 commits

  • * 'ptrace' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc: (41 commits)
    signal: trivial, fix the "timespec declared inside parameter list" warning
    job control: reorganize wait_task_stopped()
    ptrace: fix signal->wait_chldexit usage in task_clear_group_stop_trapping()
    signal: sys_sigprocmask() needs retarget_shared_pending()
    signal: cleanup sys_sigprocmask()
    signal: rename signandsets() to sigandnsets()
    signal: do_sigtimedwait() needs retarget_shared_pending()
    signal: introduce do_sigtimedwait() to factor out compat/native code
    signal: sys_rt_sigtimedwait: simplify the timeout logic
    signal: cleanup sys_rt_sigprocmask()
    x86: signal: sys_rt_sigreturn() should use set_current_blocked()
    x86: signal: handle_signal() should use set_current_blocked()
    signal: sigprocmask() should do retarget_shared_pending()
    signal: sigprocmask: narrow the scope of ->siglock
    signal: retarget_shared_pending: optimize while_each_thread() loop
    signal: retarget_shared_pending: consider shared/unblocked signals only
    signal: introduce retarget_shared_pending()
    ptrace: ptrace_check_attach() should not do s/STOPPED/TRACED/
    signal: Turn SIGNAL_STOP_DEQUEUED into GROUP_STOP_DEQUEUED
    signal: do_signal_stop: Remove the unneeded task_clear_group_stop_pending()
    ...

    Linus Torvalds
     
  • * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (152 commits)
    powerpc: Fix hard CPU IDs detection
    powerpc/pmac: Update via-pmu to new syscore_ops
    powerpc/kvm: Fix the build for 32-bit Book 3S (classic) processors
    powerpc/kvm: Fix kvmppc_core_pending_dec
    powerpc: Remove last piece of GEMINI
    powerpc: Fix for Pegasos keyboard and mouse
    powerpc: Make early memory scan more resilient to out of order nodes
    powerpc/pseries/iommu: Cleanup ddw naming
    powerpc/pseries/iommu: Find windows after kexec during boot
    powerpc/pseries/iommu: Remove ddw property when destroying window
    powerpc/pseries/iommu: Add additional checks when changing iommu mask
    powerpc/pseries/iommu: Use correct return type in dupe_ddw_if_already_created
    powerpc: Remove unused/obsolete CONFIG_XICS
    misc: Add CARMA DATA-FPGA Programmer support
    misc: Add CARMA DATA-FPGA Access Driver
    powerpc: Make IRQ_NOREQUEST last to clear, first to set
    powerpc: Integrated Flash controller device tree bindings
    powerpc/85xx: Create dts of each core in CAMP mode for P1020RDB
    powerpc/85xx: Fix PCIe IDSEL for Px020RDB
    powerpc/85xx: P2020 DTS: re-organize dts files
    ...

    Linus Torvalds
     
  • Commit e66eed651fd1 ("list: remove prefetching from regular list
    iterators") removed the include of prefetch.h from list.h, which
    uncovered several cases that had apparently relied on that rather
    obscure header file dependency.

    So this fixes things up a bit, using

    grep -L linux/prefetch.h $(git grep -l '[^a-z_]prefetchw*(' -- '*.[ch]')
    grep -L 'prefetchw*(' $(git grep -l 'linux/prefetch.h' -- '*.[ch]')

    to guide us in finding files that either need
    inclusion, or have it despite not needing it.

    There are more of them around (mostly network drivers), but this gets
    many core ones.

    Reported-by: Stephen Rothwell
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     

20 May, 2011

36 commits

  • commit 9d07bc841c9779b4d7902e417f4e509996ce805d
    "powerpc: Properly handshake CPUs going out of boot spin loop"

    Would cause a miscalculation of the hard CPU ID. It removes breaking
    out of the loop when finding a match with a processor, thus the "i"
    used as an index in the intserv array is always incorrect

    This broke interrupt on my PowerMac laptop.

    Signed-off-by: Benjamin Herrenschmidt

    Benjamin Herrenschmidt
     
  • Manual merge of arch/powerpc/kernel/smp.c and add missing scheduler_ipi()
    call to arch/powerpc/platforms/cell/interrupt.c

    Signed-off-by: Benjamin Herrenschmidt

    Benjamin Herrenschmidt
     
  • Benjamin Herrenschmidt
     
  • Commits a5d4f3ad3a ("powerpc: Base support for exceptions using
    HSRR0/1") and 673b189a2e ("powerpc: Always use SPRN_SPRG_HSCRATCH0
    when running in HV mode") cause compile and link errors for 32-bit
    classic Book 3S processors when KVM is enabled. This fixes these
    errors.

    Signed-off-by: Paul Mackerras
    Signed-off-by: Benjamin Herrenschmidt

    Paul Mackerras
     
  • The vcpu->arch.pending_exceptions field is a bitfield indexed by
    interrupt priority number as returned by kvmppc_book3s_vec2irqprio.
    However, kvmppc_core_pending_dec was using an interrupt vector shifted
    by 7 as the bit index. Fix it to use the irqprio value for the
    decrementer interrupt instead. This problem was found by code
    inspection.

    Signed-off-by: Paul Mackerras
    Signed-off-by: Benjamin Herrenschmidt

    Paul Mackerras
     
  • …/gregkh/driver-core-2.6

    * 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (44 commits)
    debugfs: Silence DEBUG_STRICT_USER_COPY_CHECKS=y warning
    sysfs: remove "last sysfs file:" line from the oops messages
    drivers/base/memory.c: fix warning due to "memory hotplug: Speed up add/remove when blocks are larger than PAGES_PER_SECTION"
    memory hotplug: Speed up add/remove when blocks are larger than PAGES_PER_SECTION
    SYSFS: Fix erroneous comments for sysfs_update_group().
    driver core: remove the driver-model structures from the documentation
    driver core: Add the device driver-model structures to kerneldoc
    Translated Documentation/email-clients.txt
    RAW driver: Remove call to kobject_put().
    reboot: disable usermodehelper to prevent fs access
    efivars: prevent oops on unload when efi is not enabled
    Allow setting of number of raw devices as a module parameter
    Introduce CONFIG_GOOGLE_FIRMWARE
    driver: Google Memory Console
    driver: Google EFI SMI
    x86: Better comments for get_bios_ebda()
    x86: get_bios_ebda_length()
    misc: fix ti-st build issues
    params.c: Use new strtobool function to process boolean inputs
    debugfs: move to new strtobool
    ...

    Fix up trivial conflicts in fs/debugfs/file.c due to the same patch
    being applied twice, and an unrelated cleanup nearby.

    Linus Torvalds
     
  • * 'x86-smep-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, cpu: Enable/disable Supervisor Mode Execution Protection
    x86, cpu: Add SMEP CPU feature in CR4
    x86, cpufeature: Add cpufeature flag for SMEP

    Linus Torvalds
     
  • …nel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

    * 'x86-reboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86: Reorder reboot method preferences

    * 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, setup: Fix EDD3.0 data verification.

    Linus Torvalds
     
  • …el/git/tip/linux-2.6-tip

    * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86: Introduce pci_map_biosrom()
    x86, olpc: Use device tree for platform identification

    Linus Torvalds
     
  • * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (50 commits)
    x86, mm: Allow ZONE_DMA to be configurable
    x86, NUMA: Trim numa meminfo with max_pfn in a separate loop
    x86, NUMA: Rename setup_node_bootmem() to setup_node_data()
    x86, NUMA: Enable emulation on 32bit too
    x86, NUMA: Enable CONFIG_AMD_NUMA on 32bit too
    x86, NUMA: Rename amdtopology_64.c to amdtopology.c
    x86, NUMA: Make numa_init_array() static
    x86, NUMA: Make 32bit use common NUMA init path
    x86, NUMA: Initialize and use remap allocator from setup_node_bootmem()
    x86-32, NUMA: Add @start and @end to init_alloc_remap()
    x86, NUMA: Remove long 64bit assumption from numa.c
    x86, NUMA: Enable build of generic NUMA init code on 32bit
    x86, NUMA: Move NUMA init logic from numa_64.c to numa.c
    x86-32, NUMA: Update numaq to use new NUMA init protocol
    x86-32, NUMA: Replace srat_32.c with srat.c
    x86-32, NUMA: implement temporary NUMA init shims
    x86, NUMA: Move numa_nodes_parsed to numa.[hc]
    x86-32, NUMA: Move get_memcfg_numa() into numa_32.c
    x86, NUMA: make srat.c 32bit safe
    x86, NUMA: rename srat_64.c to srat.c
    ...

    Linus Torvalds
     
  • …d 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

    * 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, efi: Ensure that the entirity of a region is mapped
    x86, efi: Pass a minimal map to SetVirtualAddressMap()
    x86, efi: Merge contiguous memory regions of the same type and attribute
    x86, efi: Consolidate EFI nx control
    x86, efi: Remove virtual-mode SetVirtualAddressMap call

    * 'x86-gart-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, gart: Don't enforce GART aperture lower-bound by alignment

    * 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86: Don't unmask disabled irqs when migrating them
    x86: Skip migrating IRQF_PER_CPU irqs in fixup_irqs()

    * 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, mce: Drop the default decoding notifier
    x86, MCE: Do not taint when handling correctable errors

    Linus Torvalds
     
  • * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, cpu: Fix detection of Celeron Covington stepping A1 and B0
    Documentation, ABI: Update L3 cache index disable text
    x86, AMD, cacheinfo: Fix L3 cache index disable checks
    x86, AMD, cacheinfo: Fix fallout caused by max3 conversion
    x86, cpu: Change NOP selection for certain Intel CPUs
    x86, cpu: Clean up and unify the NOP selection infrastructure
    x86, percpu: Use ASM_NOP4 instead of hardcoding P6_NOP4
    x86, cpu: Move AMD Elan Kconfig under "Processor family"

    Fix up trivial conflicts in alternative handling (commit dc326fca2b64
    "x86, cpu: Clean up and unify the NOP selection infrastructure" removed
    some hacky 5-byte instruction stuff, while commit d430d3d7e646 "jump
    label: Introduce static_branch() interface" renamed HAVE_JUMP_LABEL to
    CONFIG_JUMP_LABEL in the code that went away)

    Linus Torvalds
     
  • …inus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

    * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, apic: Print verbose error interrupt reason on apic=debug

    * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86: Demacro CONFIG_PARAVIRT cpu accessors

    * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86: Fix mrst sparse complaints
    x86: Fix spelling error in the memcpy() source code comment
    x86, mpparse: Remove unnecessary variable

    Linus Torvalds
     
  • …x/kernel/git/tip/linux-2.6-tip

    * 'timers-clockevents-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86: hpet: Cleanup the clockevents init and register code
    x86: Convert PIT to clockevents_config_and_register()
    clockevents: Provide interface to reconfigure an active clock event device
    clockevents: Provide combined configure and register function
    clockevents: Restructure clock_event_device members
    clocksource: Get rid of the hardcoded 5 seconds sleep time limit
    clocksource: Restructure clocksource struct members

    Linus Torvalds
     
  • …x/kernel/git/tip/linux-2.6-tip

    * 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    clocksource: convert mips to generic i8253 clocksource
    clocksource: convert x86 to generic i8253 clocksource
    clocksource: convert footbridge to generic i8253 clocksource
    clocksource: add common i8253 PIT clocksource
    blackfin: convert to clocksource_register_hz
    mips: convert to clocksource_register_hz/khz
    sparc: convert to clocksource_register_hz/khz
    alpha: convert to clocksource_register_hz
    microblaze: convert to clocksource_register_hz/khz
    ia64: convert to clocksource_register_hz/khz
    x86: Convert remaining x86 clocksources to clocksource_register_hz/khz
    Make clocksource name const

    Linus Torvalds
     
  • …kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

    * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (60 commits)
    sched: Fix and optimise calculation of the weight-inverse
    sched: Avoid going ahead if ->cpus_allowed is not changed
    sched, rt: Update rq clock when unthrottling of an otherwise idle CPU
    sched: Remove unused parameters from sched_fork() and wake_up_new_task()
    sched: Shorten the construction of the span cpu mask of sched domain
    sched: Wrap the 'cfs_rq->nr_spread_over' field with CONFIG_SCHED_DEBUG
    sched: Remove unused 'this_best_prio arg' from balance_tasks()
    sched: Remove noop in alloc_rt_sched_group()
    sched: Get rid of lock_depth
    sched: Remove obsolete comment from scheduler_tick()
    sched: Fix sched_domain iterations vs. RCU
    sched: Next buddy hint on sleep and preempt path
    sched: Make set_*_buddy() work on non-task entities
    sched: Remove need_migrate_task()
    sched: Move the second half of ttwu() to the remote cpu
    sched: Restructure ttwu() some more
    sched: Rename ttwu_post_activation() to ttwu_do_wakeup()
    sched: Remove rq argument from ttwu_stat()
    sched: Remove rq->lock from the first half of ttwu()
    sched: Drop rq->lock from sched_exec()
    ...

    * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    sched: Fix rt_rq runtime leakage bug

    Linus Torvalds
     
  • …git/tip/linux-2.6-tip

    * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (107 commits)
    perf stat: Add more cache-miss percentage printouts
    perf stat: Add -d -d and -d -d -d options to show more CPU events
    ftrace/kbuild: Add recordmcount files to force full build
    ftrace: Add self-tests for multiple function trace users
    ftrace: Modify ftrace_set_filter/notrace to take ops
    ftrace: Allow dynamically allocated function tracers
    ftrace: Implement separate user function filtering
    ftrace: Free hash with call_rcu_sched()
    ftrace: Have global_ops store the functions that are to be traced
    ftrace: Add ops parameter to ftrace_startup/shutdown functions
    ftrace: Add enabled_functions file
    ftrace: Use counters to enable functions to trace
    ftrace: Separate hash allocation and assignment
    ftrace: Create a global_ops to hold the filter and notrace hashes
    ftrace: Use hash instead for FTRACE_FL_FILTER
    ftrace: Replace FTRACE_FL_NOTRACE flag with a hash of ignored functions
    perf bench, x86: Add alternatives-asm.h wrapper
    x86, 64-bit: Fix copy_[to/from]_user() checks for the userspace address limit
    x86, mem: memset_64.S: Optimize memset by enhanced REP MOVSB/STOSB
    x86, mem: memmove_64.S: Optimize memmove by enhanced REP MOVSB/STOSB
    ...

    Linus Torvalds
     
  • …/git/tip/linux-2.6-tip

    * 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, gart: Rename pci-gart_64.c to amd_gart_64.c
    x86/amd-iommu: Use threaded interupt handler
    arch/x86/kernel/pci-iommu_table.c: Convert sprintf_symbol to %pS
    x86/amd-iommu: Add support for invalidate_all command
    x86/amd-iommu: Add extended feature detection
    x86/amd-iommu: Add ATS enable/disable code
    x86/amd-iommu: Add flag to indicate IOTLB support
    x86/amd-iommu: Flush device IOTLB if ATS is enabled
    x86/amd-iommu: Select PCI_IOV with AMD IOMMU driver
    PCI: Move ATS declarations in seperate header file
    dma-debug: print information about leaked entry
    x86/amd-iommu: Flush all internal TLBs when IOMMUs are enabled
    x86/amd-iommu: Rename iommu_flush_device
    x86/amd-iommu: Improve handling of full command buffer
    x86/amd-iommu: Rename iommu_flush* to domain_flush*
    x86/amd-iommu: Remove command buffer resetting logic
    x86/amd-iommu: Cleanup completion-wait handling
    x86/amd-iommu: Cleanup inv_pages command handling
    x86/amd-iommu: Move inv-dte command building to own function
    x86/amd-iommu: Move compl-wait command building to own function

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: (34 commits)
    PM: Introduce generic prepare and complete callbacks for subsystems
    PM: Allow drivers to allocate memory from .prepare() callbacks safely
    PM: Remove CONFIG_PM_VERBOSE
    Revert "PM / Hibernate: Reduce autotuned default image size"
    PM / Hibernate: Add sysfs knob to control size of memory for drivers
    PM / Wakeup: Remove useless synchronize_rcu() call
    kmod: always provide usermodehelper_disable()
    PM / ACPI: Remove acpi_sleep=s4_nonvs
    PM / Wakeup: Fix build warning related to the "wakeup" sysfs file
    PM: Print a warning if firmware is requested when tasks are frozen
    PM / Runtime: Rework runtime PM handling during driver removal
    Freezer: Use SMP barriers
    PM / Suspend: Do not ignore error codes returned by suspend_enter()
    PM: Fix build issue in clock_ops.c for CONFIG_PM_RUNTIME unset
    PM: Revert "driver core: platform_bus: allow runtime override of dev_pm_ops"
    OMAP1 / PM: Use generic clock manipulation routines for runtime PM
    PM: Remove sysdev suspend, resume and shutdown operations
    PM / PowerPC: Use struct syscore_ops instead of sysdevs for PM
    PM / UNICORE32: Use struct syscore_ops instead of sysdevs for PM
    PM / AVR32: Use struct syscore_ops instead of sysdevs for PM
    ...

    Linus Torvalds
     
  • * 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (48 commits)
    MIPS: Move arch_get_unmapped_area and gang to new file.
    MIPS: Cleanup arch_get_unmapped_area
    MIPS: Octeon: Don't request interrupts for unused IPI mailbox bits.
    Octeon: Fix interrupt irq settings for performance counters.
    MIPS: Fix build warnings on defconfigs
    MIPS: Lemote 2F, Malta: Fix build warning
    MIPS: Set ELF AT_PLATFORM string for Loongson2 processors
    MIPS: Set ELF AT_PLATFORM string for BMIPS processors
    MIPS: Introduce set_elf_platform() helper function
    MIPS: JZ4740: setup: Autodetect physical memory.
    MIPS: BCM47xx: Fix MAC address parsing.
    MIPS: BCM47xx: Extend the filling of SPROM from NVRAM
    MIPS: BCM47xx: Register SSB fallback sprom callback
    MIPS: BCM47xx: Extend bcm47xx_fill_sprom with prefix.
    SSB: Change fallback sprom to callback mechanism.
    MIPS: Alchemy: Clean up GPIO registers and accessors
    MIPS: Alchemy: Cleanup DMA addresses
    MIPS: Alchemy: Rewrite ethernet platform setup
    MIPS: Alchemy: Rewrite UART setup and constants.
    MIPS: Alchemy: Convert dbdma.c to syscore_ops
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
    input/atari: Fix mouse movement and button mapping
    input/atari: Fix atarimouse init
    input/atari: Use the correct mouse interrupt hook
    m68k/atari: Do not use "/" in interrupt names
    m68k: unistd - Comment out definitions for unimplemented syscalls
    m68k: Really wire up sys_pselect6 and sys_ppoll
    m68k: Merge mmu and non-mmu versions of sys_call_table
    MAINTAINERS: Roman Zippel has been MIA for several years.
    m68k: bitops - Never step beyond the end of the bitmap
    m68k: bitops - offset == ((long)p - (long)vaddr) * 8

    Linus Torvalds
     
  • …stable/mmu.bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

    * 'stable/irq' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen: do not clear and mask evtchns in __xen_evtchn_do_upcall

    * 'stable/p2m.bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen/p2m: Create entries in the P2M_MFN trees's to track 1-1 mappings

    * 'stable/e820.bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen/setup: Fix for incorrect xen_extra_mem_start initialization under 32-bit
    xen/setup: Ignore E820_UNUSABLE when setting 1-1 mappings.

    * 'stable/mmu.bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen mmu: fix a race window causing leave_mm BUG()

    Linus Torvalds
     
  • …t.kernel.org/pub/scm/linux/kernel/git/konrad/xen

    * 'stable/balloon.cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen/balloon: Move dec_totalhigh_pages() from __balloon_append() to balloon_append()
    xen/balloon: Clarify credit calculation
    xen/balloon: Simplify HVM integration
    xen/balloon: Use PageHighMem() for high memory page detection

    * 'stable/general.cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    drivers/xen/sys-hypervisor: Cleanup code/data sections definitions
    arch/x86/xen/smp: Cleanup code/data sections definitions
    arch/x86/xen/time: Cleanup code/data sections definitions
    arch/x86/xen/xen-ops: Cleanup code/data sections definitions
    arch/x86/xen/mmu: Cleanup code/data sections definitions
    arch/x86/xen/setup: Cleanup code/data sections definitions
    arch/x86/xen/enlighten: Cleanup code/data sections definitions
    arch/x86/xen/irq: Cleanup code/data sections definitions
    xen: tidy up whitespace in drivers/xen/Makefile

    Linus Torvalds
     
  • …rnel.org/pub/scm/linux/kernel/git/konrad/xen

    * 'stable/backend.base.v3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen/pci: Fix compiler error when CONFIG_XEN_PRIVILEGED_GUEST is not set.
    xen/p2m: Add EXPORT_SYMBOL_GPL to the M2P override functions.
    xen/p2m/m2p/gnttab: Support GNTMAP_host_map in the M2P override.
    xen/irq: The Xen hypervisor cleans up the PIRQs if the other domain forgot.
    xen/irq: Export 'xen_pirq_from_irq' function.
    xen/irq: Add support to check if IRQ line is shared with other domains.
    xen/irq: Check if the PCI device is owned by a domain different than DOMID_SELF.
    xen/pci: Add xen_[find|register|unregister]_device_domain_owner functions.

    * 'stable/gntalloc.v7' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen/gntdev,gntalloc: Remove unneeded VM flags

    Linus Torvalds
     
  • * 'move-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
    [CPUFREQ] Move x86 drivers to drivers/cpufreq/

    Linus Torvalds
     
  • * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
    [CPUFREQ] remove redundant sprintf from request_module call.
    [CPUFREQ] cpufreq_stats.c: Fixed brace coding style issue
    [CPUFREQ] Fix memory leak in cpufreq_stat
    [CPUFREQ] cpufreq.h: Fix some checkpatch.pl coding style issues.
    [CPUFREQ] use dynamic debug instead of custom infrastructure
    [CPUFREQ] CPU hotplug, re-create sysfs directory and symlinks
    [CPUFREQ] Fix _OSC UUID in pcc-cpufreq

    Linus Torvalds
     
  • Signed-off-by: Dave Jones

    Dave Jones
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
    params.c: Use new strtobool function to process boolean inputs
    debugfs: move to new strtobool
    Add a strtobool function matching semantics of existing in kernel equivalents
    modpost: Update 64k section support for binutils 2.18.50
    module: Use binary search in lookup_symbol()
    module: Use the binary search for symbols resolution
    lib: Add generic binary search function to the kernel.
    module: Sort exported symbols
    module: each_symbol_section instead of each_symbol
    module: split unset_section_ro_nx function.
    module: undo module RONX protection correctly.
    module: zero mod->init_ro_size after init is freed.
    minor ANSI prototype sparse fix
    module: reorder kparam_array to remove alignment padding on 64 bit builds
    module: remove 64 bit alignment padding from struct module with CONFIG_TRACE*
    module: do not hide __modver_version_show declaration behind ifdef
    module: deal with alignment issues in built-in module versions

    Linus Torvalds
     
  • * 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs:
    Correct occurrences of - Documentation/kvm/ to Documentation/virtual/kvm - Documentation/uml/ to Documentation/virtual/uml - Documentation/lguest/ to Documentation/virtual/lguest throughout the kernel source tree.
    Add a 00-INDEX file to Documentation/virtual Remove uml from the top level 00-INDEX file.
    Move kvm, uml, and lguest subdirectories under a common "virtual" directory, I.E:

    Linus Torvalds
     
  • The Atari keyboard driver calls atari_mouse_interrupt_hook if it's set, not
    atari_input_mouse_interrupt_hook. Fix below.

    [geert] Killed off atari_mouse_interrupt_hook completely, after fixing another
    incorrect assignment in atarimouse.c.

    Signed-off-by: Michael Schmitz
    Signed-off-by: Geert Uytterhoeven

    Michael Schmitz
     
  • It may trigger a warning in fs/proc/generic.c:__xlate_proc_name() when
    trying to add an entry for the interrupt handler to sysfs.

    Signed-off-by: Geert Uytterhoeven

    Geert Uytterhoeven
     
  • Suggested-by: Arnd Bergmann
    Signed-off-by: Geert Uytterhoeven

    Geert Uytterhoeven
     
  • We reserved the numbers a long time ago, but never wired them up in the
    syscall table as they need TIF_RESTORE_SIGMASK, which we only got last year
    in commit cb6831d5d3099e772a510eb3e1ed0760ccffb45e ("m68k: Switch to saner
    sigsuspend()")

    Signed-off-by: Geert Uytterhoeven
    Acked-by: Greg Ungerer
    Cc: stable@kernel.org

    Geert Uytterhoeven
     
  • Impact for nommu:
    - Store table in .rodata instead of .text,
    - Let kernel/sys_ni.c handle the stubbing of MMU-only syscalls,
    - Implement sys_mremap and sys_nfsservct,
    - Remove unused padding at the end of the table.

    Impact for mmu:
    - Store table in .rodata instead of .data.

    Signed-off-by: Geert Uytterhoeven
    Acked-by: Greg Ungerer

    Geert Uytterhoeven
     
  • find_next bitops on m68k (find_next_zero_bit, find_next_bit, and
    find_next_bit_le) may cause out of bounds memory access
    when the bitmap size in bits % 32 != 0 and offset (the bitnumber
    to start searching at) is very close to the bitmap size.

    For example,

    unsigned long bitmap[2] = { 0, 0 };
    find_next_bit(bitmap, 63, 62);

    1. find_next_bit() tries to find any set bits in bitmap[1],
    but no bits set.

    2. Then find_first_bit(bimap + 2, -1)

    3. Unfortunately find_first_bit() takes unsigned int as the size argument.

    4. find_first_bit will access bitmap[2~] until it find any set bits.

    Add missing tests for stepping beyond the end of the bitmap to all
    find_{first,next}_*() functions, and make sure they never return a value
    larger than the bitmap size.

    Reported-by: Akinobu Mita
    Cc: Andreas Schwab
    Signed-off-by: Geert Uytterhoeven

    Geert Uytterhoeven
     
  • Hence use "offset" in find_next_{,zero_}bit(), like is already done for
    find_next_{,zero_}bit_le()

    Signed-off-by: Geert Uytterhoeven
    Cc: Akinobu Mita
    Cc: Andreas Schwab
    Signed-off-by: Geert Uytterhoeven

    Geert Uytterhoeven
     

19 May, 2011

1 commit