18 Jun, 2009

1 commit

  • It is generally agreed that it would be beneficial for u64 to be an
    unsigned long long on all architectures. ia64 (in common with several
    other 64-bit architectures) currently uses unsigned long. Migrating
    piecemeal is too painful; this giant patch fixes all compilation warnings
    and errors that come as a result of switching to use int-ll64.h.

    Note that userspace will still see __u64 defined as unsigned long. This
    is important as it affects C++ name mangling.

    [Updated by Tony Luck to change efi.h:efi_freemem_callback_t to use
    u64 for start/end rather than unsigned long]

    Signed-off-by: Matthew Wilcox
    Signed-off-by: Tony Luck

    Matthew Wilcox
     

17 Jun, 2009

2 commits


16 Jun, 2009

10 commits

  • Signed-off-by: Jaswinder Singh Rajput
    Signed-off-by: Andrew Morton
    Signed-off-by: Tony Luck

    Jaswinder Singh Rajput
     
  • The defines and typedefs (hw_interrupt_type, no_irq_type, irq_desc_t) have
    been kept around for migration reasons. After more than two years it's
    time to remove them finally.

    This patch cleans up one of the remaining users. When all such patches
    hit mainline we can remove the defines and typedefs finally.

    Impact: cleanup

    Convert the last remaining users to struct irq_chip and remove the
    define.

    Signed-off-by: Thomas Gleixner
    Signed-off-by: Andrew Morton
    Signed-off-by: Tony Luck

    Thomas Gleixner
     
  • The defines and typedefs (hw_interrupt_type, no_irq_type, irq_desc_t) have
    been kept around for migration reasons. After more than two years it's
    time to remove them finally.

    This patch cleans up one of the remaining users. When all such patches
    hit mainline we can remove the defines and typedefs finally.

    Impact: cleanup

    Convert the last remaining users and remove the typedef.

    Signed-off-by: Thomas Gleixner
    Signed-off-by: Andrew Morton
    Signed-off-by: Tony Luck

    Thomas Gleixner
     
  • The defines and typedefs (hw_interrupt_type, no_irq_type, irq_desc_t) have
    been kept around for migration reasons. After more than two years it's
    time to remove them finally.

    This patch cleans up one of the remaining users. When all such patches
    hit mainline we can remove the defines and typedefs finally.

    Impact: cleanup

    convert the last remaining users to no_irq_chip

    Signed-off-by: Thomas Gleixner
    Signed-off-by: Andrew Morton
    Signed-off-by: Tony Luck

    Thomas Gleixner
     
  • fpswa.h is not relevant for userspace,
    so do not export it.

    Signed-off-by: Sam Ravnborg
    Signed-off-by: Tony Luck

    Sam Ravnborg
     
  • * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
    [IA64] fix compile error in arch/ia64/mm/extable.c

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

    * 'timers-for-linus-migration' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    timers: Logic to move non pinned timers
    timers: /proc/sys sysctl hook to enable timer migration
    timers: Identifying the existing pinned timers
    timers: Framework for identifying pinned timers
    timers: allow deferrable timers for intervals tv2-tv5 to be deferred

    Fix up conflicts in kernel/sched.c and kernel/timer.c manually

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1244 commits)
    pkt_sched: Rename PSCHED_US2NS and PSCHED_NS2US
    ipv4: Fix fib_trie rebalancing
    Bluetooth: Fix issue with uninitialized nsh.type in DTL-1 driver
    Bluetooth: Fix Kconfig issue with RFKILL integration
    PIM-SM: namespace changes
    ipv4: update ARPD help text
    net: use a deferred timer in rt_check_expire
    ieee802154: fix kconfig bool/tristate muckup
    bonding: initialization rework
    bonding: use is_zero_ether_addr
    bonding: network device names are case sensative
    bonding: elminate bad refcount code
    bonding: fix style issues
    bonding: fix destructor
    bonding: remove bonding read/write semaphore
    bonding: initialize before registration
    bonding: bond_create always called with default parameters
    x_tables: Convert printk to pr_err
    netfilter: conntrack: optional reliable conntrack event delivery
    list_nulls: add hlist_nulls_add_head and hlist_nulls_del
    ...

    Linus Torvalds
     
  • * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (103 commits)
    powerpc: Fix bug in move of altivec code to vector.S
    powerpc: Add support for swiotlb on 32-bit
    powerpc/spufs: Remove unused error path
    powerpc: Fix warning when printing a resource_size_t
    powerpc/xmon: Remove unused variable in xmon.c
    powerpc/pseries: Fix warnings when printing resource_size_t
    powerpc: Shield code specific to 64-bit server processors
    powerpc: Separate PACA fields for server CPUs
    powerpc: Split exception handling out of head_64.S
    powerpc: Introduce CONFIG_PPC_BOOK3S
    powerpc: Move VMX and VSX asm code to vector.S
    powerpc: Set init_bootmem_done on NUMA platforms as well
    powerpc/mm: Fix a AB->BA deadlock scenario with nohash MMU context lock
    powerpc/mm: Fix some SMP issues with MMU context handling
    powerpc: Add PTRACE_SINGLEBLOCK support
    fbdev: Add PLB support and cleanup DCR in xilinxfb driver.
    powerpc/virtex: Add ml510 reference design device tree
    powerpc/virtex: Add Xilinx ML510 reference design support
    powerpc/virtex: refactor intc driver and add support for i8259 cascading
    powerpc/virtex: Add support for Xilinx PCI host bridge
    ...

    Linus Torvalds
     
  • ad6561dffa17f17bb68d7207d422c26c381c4313 ("module: trim exception table on init
    free.") put a bogus trim_init_extable() function into ia64 which didn't compile.

    Signed-off-by: Rusty Russell
    Signed-off-by: Tony Luck

    Rusty Russell
     

15 Jun, 2009

5 commits

  • Conflicts:
    Documentation/feature-removal-schedule.txt
    drivers/scsi/fcoe/fcoe.c
    net/core/drop_monitor.c
    net/core/net-traces.c

    David S. Miller
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/headers-check-2.6:
    headers_check fix: mn10300, setup.h
    headers_check fix: mn10300, ptrace.h

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (31 commits)
    trivial: remove the trivial patch monkey's name from SubmittingPatches
    trivial: Fix a typo in comment of addrconf_dad_start()
    trivial: usb: fix missing space typo in doc
    trivial: pci hotplug: adding __init/__exit macros to sgi_hotplug
    trivial: Remove the hyphen from git commands
    trivial: fix ETIMEOUT -> ETIMEDOUT typos
    trivial: Kconfig: .ko is normally not included in module names
    trivial: SubmittingPatches: fix typo
    trivial: Documentation/dell_rbu.txt: fix typos
    trivial: Fix Pavel's address in MAINTAINERS
    trivial: ftrace:fix description of trace directory
    trivial: unnecessary (void*) cast removal in sound/oss/msnd.c
    trivial: input/misc: Fix typo in Kconfig
    trivial: fix grammo in bus_for_each_dev() kerneldoc
    trivial: rbtree.txt: fix rb_entry() parameters in sample code
    trivial: spelling fix in ppc code comments
    trivial: fix typo in bio_alloc kernel doc
    trivial: Documentation/rbtree.txt: cleanup kerneldoc of rbtree.txt
    trivial: Miscellaneous documentation typo fixes
    trivial: fix typo milisecond/millisecond for documentation and source comments.
    ...

    Linus Torvalds
     
  • * master.kernel.org:/home/rmk/linux-2.6-arm:
    [ARM] 5545/2: add flush_kernel_dcache_page() for ARM

    Linus Torvalds
     
  • * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (417 commits)
    MAINTAINERS: EB110ATX is not ebsa110
    MAINTAINERS: update Eric Miao's email address and status
    fb: add support of LCD display controller on pxa168/910 (base layer)
    [ARM] 5552/1: ep93xx get_uart_rate(): use EP93XX_SYSCON_PWRCNT and EP93XX_SYSCON_PWRCN
    [ARM] pxa/sharpsl_pm: zaurus needs generic pxa suspend/resume routines
    [ARM] 5544/1: Trust PrimeCell resource sizes
    [ARM] pxa/sharpsl_pm: cleanup of gpio-related code.
    [ARM] pxa/sharpsl_pm: drop set_irq_type calls
    [ARM] pxa/sharpsl_pm: merge pxa-specific code into generic one
    [ARM] pxa/sharpsl_pm: merge the two sharpsl_pm.c since it's now pxa specific
    [ARM] sa1100: remove unused collie_pm.c
    [ARM] pxa: fix the conflicting non-static declarations of global_gpios[]
    [ARM] 5550/1: Add default configure file for w90p910 platform
    [ARM] 5549/1: Add clock api for w90p910 platform.
    [ARM] 5548/1: Add gpio api for w90p910 platform
    [ARM] 5551/1: Add multi-function pin api for w90p910 platform.
    [ARM] Make ARM_VIC_NR depend on ARM_VIC
    [ARM] 5546/1: ARM PL022 SSP/SPI driver v3
    ARM: OMAP4: SMP: Update defconfig for OMAP4430
    ARM: OMAP4: SMP: Enable SMP support for OMAP4430
    ...

    Linus Torvalds
     

14 Jun, 2009

11 commits

  • Without this, the default implementation is a no op which is completely
    wrong with a VIVT cache, and usage of sg_copy_buffer() produces
    unpredictable results.

    Tested-by: Sebastian Andrzej Siewior

    CC: stable@kernel.org
    Signed-off-by: Nicolas Pitre
    Signed-off-by: Russell King

    Nicolas Pitre
     
  • Conflicts:
    arch/arm/Makefile
    Updates:
    arch/arm/mach-u300/core.c
    arch/arm/mach-u300/timer.c

    Russell King
     
  • Russell King
     
  • …xa-linux-2.6 into devel

    Russell King
     
  • Russell King
     
  • fix the following 'make headers_check' warnings:

    usr/include/asm-mn10300/setup.h:14: extern's make no sense in userspace
    usr/include/asm-mn10300/setup.h:15: extern's make no sense in userspace

    Signed-off-by: Jaswinder Singh Rajput

    Jaswinder Singh Rajput
     
  • fix the following 'make headers_check' warning:

    usr/include/asm-mn10300/ptrace.h:80: extern's make no sense in userspace

    Signed-off-by: Jaswinder Singh Rajput

    Jaswinder Singh Rajput
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
    avr32: Fix oops on unaligned user access
    avr32: Add support for Mediama RMTx add-on board for ATNGW100
    avr32: Change Atmel ATNGW100 config to add choice of add-on board
    Fix MIMC200 board LCD init
    avr32: Fix clash in ATMEL_USART_ flags
    avr32: remove obsolete hw_interrupt_type
    avr32: Solves problem with inverted MCI detect pin on Merisc board
    atmel-mci: Add support for inverted detect pin

    Linus Torvalds
     
  • Fix interaction with new generic header stuff as added by:

    commit 6103ec56c65c33774c7c38652c8204120c3c7519
    Author: Arnd Bergmann
    Date: Wed May 13 22:56:27 2009 +0000

    asm-generic: add generic ABI headers

    The problem is that asm/signal.h has been made to include asm-generic/signal.h,
    but the redundant stuff from asm/signal.h has not been discarded, leading to
    multiple redefinitions.

    Cc: Arnd Bergmann
    Signed-off-by: David Howells
    Signed-off-by: Linus Torvalds

    David Howells
     
  • * 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (80 commits)
    x86, mce: Add boot options for corrected errors
    x86, mce: Fix mce printing
    x86, mce: fix for mce counters
    x86, mce: support action-optional machine checks
    x86, mce: define MCE_VECTOR
    x86, mce: rename mce_notify_user to mce_notify_irq
    x86: fix panic with interrupts off (needed for MCE)
    x86, mce: export MCE severities coverage via debugfs
    x86, mce: implement new status bits
    x86, mce: print header/footer only once for multiple MCEs
    x86, mce: default to panic timeout for machine checks
    x86, mce: improve mce_get_rip
    x86, mce: make non Monarch panic message "Fatal machine check" too
    x86, mce: switch x86 machine check handler to Monarch election.
    x86, mce: implement panic synchronization
    x86, mce: implement bootstrapping for machine check wakeups
    x86, mce: check early in exception handler if panic is needed
    x86, mce: add table driven machine check grading
    x86, mce: remove TSC print heuristic
    x86, mce: log corrected errors when panicing
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (35 commits)
    hwrng: timeriomem - Fix potential oops (request_mem_region/__devinit)
    crypto: api - Use formatting of module name
    crypto: testmgr - Allow hash test vectors longer than a page
    crypto: testmgr - Check all test vector lengths
    crypto: hifn_795x - fix __dev{init,exit} markings
    crypto: tcrypt - Do not exit on success in fips mode
    crypto: compress - Return produced bytes in crypto_{,de}compress_{update,final}
    hwrng: via_rng - Support VIA Nano hardware RNG on X86_64 builds
    hwrng: via_rng - Support VIA Nano hardware RNG
    hwrng: via_rng - The VIA Hardware RNG driver is for the CPU, not Chipset
    crypto: testmgr - Skip algs not flagged fips_allowed in fips mode
    crypto: testmgr - Mark algs allowed in fips mode
    crypto: testmgr - Add ctr(aes) test vectors
    crypto: testmgr - Dynamically allocate xbuf and axbuf
    crypto: testmgr - Print self-test pass notices in fips mode
    crypto: testmgr - Catch base cipher self-test failures in fips mode
    crypto: testmgr - Add ansi_cprng test vectors
    crypto: testmgr - Add infrastructure for ansi_cprng self-tests
    crypto: testmgr - Add self-tests for rfc4309(ccm(aes))
    crypto: testmgr - Handle AEAD test vectors expected to fail verification
    ...

    Linus Torvalds
     

13 Jun, 2009

11 commits

  • The unaligned address exception handler (and others) does not scan the
    fixup tables before oopsing. This is bad because it means passing a
    badly aligned pointer from user space might crash the kernel.

    Fix this by scanning the fixup tables in _exception(). This should
    resolve the issue for unaligned addresses as well as other less common
    exceptions that might be happening during a userspace access. The page
    fault handler already does fixup processing.

    Signed-off-by: Haavard Skinnemoen

    Haavard Skinnemoen
     
  • Haavard Skinnemoen
     
  • * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (30 commits)
    [S390] wire up sys_perf_counter_open
    [S390] wire up sys_rt_tgsigqueueinfo
    [S390] ftrace: add system call tracer support
    [S390] ftrace: add function graph tracer support
    [S390] ftrace: add function trace mcount test support
    [S390] ftrace: add dynamic ftrace support
    [S390] kprobes: use probe_kernel_write
    [S390] maccess: arch specific probe_kernel_write() implementation
    [S390] maccess: add weak attribute to probe_kernel_write
    [S390] profile_tick called twice
    [S390] dasd: forward internal errors to dasd_sleep_on caller
    [S390] dasd: sync after async probe
    [S390] dasd: check_characteristics cleanup
    [S390] dasd: no High Performance FICON in 31-bit mode
    [S390] dcssblk: revert devt conversion
    [S390] qdio: fix access beyond ARRAY_SIZE of irq_ptr->{in,out}put_qs
    [S390] vmalloc: add vmalloc kernel parameter support
    [S390] uaccess: use might_fault() instead of might_sleep()
    [S390] 3270: lock dependency fixes
    [S390] 3270: do not register with tty_register_device
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
    add generic lib/checksum.c
    asm-generic: add a generic uaccess.h
    asm-generic: add generic NOMMU versions of some headers
    asm-generic: add generic atomic.h and io.h
    asm-generic: add legacy I/O header files
    asm-generic: add generic versions of common headers
    asm-generic: make bitops.h usable
    asm-generic: make pci.h usable directly
    asm-generic: make get_rtc_time overridable
    asm-generic: rename page.h and uaccess.h
    asm-generic: rename atomic.h to atomic-long.h
    asm-generic: add a generic unistd.h
    asm-generic: add generic ABI headers
    asm-generic: add generic sysv ipc headers
    asm-generic: introduce asm/bitsperlong.h
    asm-generic: rename termios.h, signal.h and mman.h

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
    PM: Add empty suspend/resume device irq functions
    PM/Hibernate: Move NVS routines into a seperate file (v2).
    PM/Hibernate: Rename disk.c to hibernate.c
    PM: Separate suspend to RAM functionality from core
    Driver Core: Rework platform suspend/resume, print warning
    PM: Remove device_type suspend()/resume()
    PM/Hibernate: Move memory shrinking to snapshot.c (rev. 2)
    PM/Suspend: Do not shrink memory before suspend
    PM: Remove bus_type suspend_late()/resume_early() V2
    PM core: rename suspend and resume functions
    PM: Rename device_power_down/up()
    PM: Remove unused asm/suspend.h
    x86: unify power/cpu_(32|64).c
    x86: unify power/cpu_(32|64) copyright notes
    x86: unify power/cpu_(32|64) regarding restoring processor state
    x86: unify power/cpu_(32|64) regarding saving processor state
    x86: unify power/cpu_(32|64) global variables
    x86: unify power/cpu_(32|64) headers
    PM: Warn if interrupts are enabled during suspend-resume of sysdevs
    PM/ACPI/x86: Fix sparse warning in arch/x86/kernel/acpi/sleep.c

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

    * 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    perf_counter: Start documenting HAVE_PERF_COUNTERS requirements
    perf_counter: Add forward/backward attribute ABI compatibility
    perf record: Explicity program a default counter
    perf_counter: Remove PERF_TYPE_RAW special casing
    perf_counter: PERF_TYPE_HW_CACHE is a hardware counter too
    powerpc, perf_counter: Fix performance counter event types
    perf_counter/x86: Add a quirk for Atom processors
    perf_counter tools: Remove one L1-data alias

    Linus Torvalds
     
  • * 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (55 commits)
    microblaze: Don't use access_ok for unaligned
    microblaze: remove unused flat_stack_align() definition
    microblaze: Fix problem with early_printk in startup
    microblaze_mmu_v2: Makefiles
    microblaze_mmu_v2: Kconfig update
    microblaze_mmu_v2: stat.h MMU update
    microblaze_mmu_v2: Elf update
    microblaze_mmu_v2: Update dma.h for MMU
    microblaze_mmu_v2: Update cacheflush.h
    microblaze_mmu_v2: Update signal returning address
    microblaze_mmu_v2: Traps MMU update
    microblaze_mmu_v2: Enable fork syscall for MMU and add fork as vfork for noMMU
    microblaze_mmu_v2: Update linker script for MMU
    microblaze_mmu_v2: Add MMU related exceptions handling
    microblaze_mmu_v2: uaccess MMU update
    microblaze_mmu_v2: Update exception handling - MMU exception
    microblaze_mmu_v2: entry.S, entry.h
    microblaze_mmu_v2: Add CURRENT_TASK for entry.S
    microblaze_mmu_v2: MMU asm offset update
    microblaze_mmu_v2: Update tlb.h and tlbflush.h
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (62 commits)
    Blackfin: fix sparseirq/kstat_irqs fallout
    Blackfin: fix unused warnings after nommu update
    Blackfin: export the last exception cause via debugfs
    Blackfin: fix length checking in kgdb_ebin2mem
    Blackfin: kgdb: fix up error return values
    Blackfin: push access_ok() L1 attribute down
    Blackfin: punt duplicated search_exception_table() prototype
    Blackfin: add missing access_ok() checks to user functions
    Blackfin: convert early_printk EVT init to a loop
    Blackfin: document the lsl variants of the L1 allocator
    Blackfin: rename Blackfin relocs according to the toolchain
    Blackfin: check SIC defines rather than variant names
    Blackfin: add SSYNC to set_dma_sg() for descriptor fetching
    Blackfin: convert SMP to only use generic time framework
    Blackfin: bf548-ezkit/bf537-stamp: add resources for ADXL345/346
    Blackfin: override default uClinux MTD addr/size
    Blackfin: fix command line corruption with DEBUG_DOUBLEFAULT
    Blackfin: fix handling of initial L1 reservation
    Blackfin: merge sram init functions
    Blackfin: drop unused reserve_pda() function
    ...

    Linus Torvalds
     
  • This patch (as1241) renames a bunch of functions in the PM core.
    Rather than go through a boring list of name changes, suffice it to
    say that in the end we have a bunch of pairs of functions:

    device_resume_noirq dpm_resume_noirq
    device_resume dpm_resume
    device_complete dpm_complete
    device_suspend_noirq dpm_suspend_noirq
    device_suspend dpm_suspend
    device_prepare dpm_prepare

    in which device_X does the X operation on a single device and dpm_X
    invokes device_X for all devices in the dpm_list.

    In addition, the old dpm_power_up and device_resume_noirq have been
    combined into a single function (dpm_resume_noirq).

    Lastly, dpm_suspend_start and dpm_resume_end are the renamed versions
    of the former top-level device_suspend and device_resume routines.

    Signed-off-by: Alan Stern
    Acked-by: Magnus Damm
    Signed-off-by: Rafael J. Wysocki

    Alan Stern
     
  • Rename the functions performing "_noirq" dev_pm_ops
    operations from device_power_down() and device_power_up()
    to device_suspend_noirq() and device_resume_noirq().

    The new function names are chosen to show that the functions
    are responsible for calling the _noirq() versions to finalize
    the suspend/resume operation. The current function names do
    not perform power down/up anymore so the names may be misleading.

    Global function renames:
    - device_power_down() -> device_suspend_noirq()
    - device_power_up() -> device_resume_noirq()

    Static function renames:
    - suspend_device_noirq() -> __device_suspend_noirq()
    - resume_device_noirq() -> __device_resume_noirq()

    Signed-off-by: Magnus Damm
    Acked-by: Greg Kroah-Hartman
    Acked-by: Len Brown
    Signed-off-by: Rafael J. Wysocki

    Magnus Damm
     
  • This patch removes unused asm/suspend.h files for
    the following architectures:

    alpha, arm, ia64, m68k, mips, s390, um

    Signed-off-by: Magnus Damm
    Acked-by: Pavel Machek
    Signed-off-by: Rafael J. Wysocki

    Magnus Damm