31 May, 2010
6 commits
-
This partially reverts commit 4ec37de89d8c758ee8115e0e64b3f994910789ee
("[IA64] Fix build breakage"), since the commit that made it necessary
got reverted earlier (see commit 35926ff5fba8, 'Revert "cpusets:
randomize node rotor used in cpuset_mem_spread_node()"')Even if we ever re-introduce this, there is no reason to make
__node_random be some architecture-specific function.Signed-off-by: Linus Torvalds
-
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (47 commits)
mfd: Rename twl5031 sih modules
mfd: Storage class for timberdale should be before const qualifier
mfd: Remove unneeded and dangerous clearing of clientdata
mfd: New AB8500 driver
gpio: Fix inverted rdc321x gpio data out registers
mfd: Change rdc321x resources flags to IORESOURCE_IO
mfd: Move pcf50633 irq related functions to its own file.
mfd: Use threaded irq for pcf50633
mfd: pcf50633-adc: Fix potential race in pcf50633_adc_sync_read
mfd: Fix pcf50633 bitfield logic in interrupt handler
gpio: rdc321x needs to select MFD_CORE
mfd: Use menuconfig for quicker config editing
ARM: AB3550 board configuration and irq for U300
mfd: AB3550 core driver
mfd: AB3100 register access change to abx500 API
mfd: Renamed ab3100.h to abx500.h
gpio: Add TC35892 GPIO driver
mfd: Add Toshiba's TC35892 MFD core
mfd: Delay to mask tsc irq in max8925
mfd: Remove incorrect wm8350 kfree
... -
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
DMAENGINE: DMA40 U8500 platform configuration
DMA: PL330: Add dma api driver -
…git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, cpufeature: Unbreak compile with gcc 3.x
x86, pat: Fix memory leak in free_memtype
x86, k8: Fix section mismatch for powernowk8_exit()
lib/atomic64_test: fix missing include of linux/kernel.h
x86: remove last traces of quicklist usage
x86, setup: Phoenix BIOS fixup is needed on Dell Inspiron Mini 1012
x86: "nosmp" command line option should force the system into UP mode
arch/x86/pci: use kasprintf
x86, apic: ack all pending irqs when crashed/on kexec -
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
parisc: Call pagefault_disable/pagefault_enable in kmap_atomic/kunmap_atomic
parisc: Remove unnecessary macros from entry.S
parisc: LWS fixes for syscall.S
parisc: Delete unnecessary nop's in entry.S
parisc: Avoid interruption in critical region in entry.S
parisc: invoke oom-killer from page fault
parisc: clear floating point exception flag on SIGFPE signal
parisc: Use of align_frame provides stack frame. -
This reverts commit 0ac0c0d0f837c499afd02a802f9cf52d3027fa3b, which
caused cross-architecture build problems for all the wrong reasons.
IA64 already added its own version of __node_random(), but the fact is,
there is nothing architectural about the function, and the original
commit was just badly done. Revert it, since no fix is forthcoming.Requested-by: Stephen Rothwell
Signed-off-by: Linus Torvalds
30 May, 2010
8 commits
-
Based on the generic implementation of kmap_atomic and kunmap_atomic,
we should call pagefault_disable and pagefault_enable in our PA8000
implementation.The define for kmap_atomic_prot was also missing, and I updated
kmap_atomic_pfn to use the generic implementation because of the
change to kmap_atomic.I believe that this change is needed to fix the fork copy-on-write
bug.Signed-off-by: John David Anglin
Signed-off-by: Kyle McMartin -
The EXTR, DEP and DEPI macros are unnecessary. There are PA 1.X
pneumonics available with the same functionality, and the DEP and DEPI
macros conflict with assembler pneumonics.Tested on a variety of 32 and 64-bit systems.
Signed-off-by: John David Anglin
Signed-off-by: Kyle McMartin -
1) Gate immediately and save a branch.
2) Fix off by one error in checking entry number.
3) Use sr7 instead of sr3 in error return path as sr3 might not
contain correct value.
4) Enable locking on UP systems to prevent incorrect operation of
the cas_action critical region on page faults.Tested on several systems, including UP c3750 with 2.6.33.2 kernel.
Signed-off-by: John David Anglin
Signed-off-by: Kyle McMartin -
Signed-off-by: John David Anglin
Signed-off-by: Kyle McMartin -
Signed-off-by: John David Anglin
Signed-off-by: Kyle McMartin -
As explained in commit 1c0fe6e3bd, we want to call the architecture independent
oom killer when getting an unexplained OOM from handle_mm_fault, rather than
simply killing current.Cc: linux-parisc@vger.kernel.org
Cc: linux-arch@vger.kernel.org
Signed-off-by: Nick Piggin
Acked-by: David Rientjes
Signed-off-by: Kyle McMartin -
Clear the floating point exception flag before returning to
user space. This is needed, else the libc trampoline handler
may hit the same SIGFPE again while building up a trampoline
to a signal handler.Fixes debian bug #559406.
Signed-off-by: Helge Deller
Signed-off-by: Kyle McMartin -
Any assembly constant generated with the use of
align_frame includes size for a full stack frame.Signed-off-by: Carlos O'Donell
Signed-off-by: Kyle McMartin
29 May, 2010
8 commits
-
* 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
intel_idle: native hardware cpuidle driver for latest Intel processors
ACPI: acpi_idle: touch TS_POLLING only in the non-MWAIT case
acpi_pad: uses MONITOR/MWAIT, so it doesn't need to clear TS_POLLING
sched: clarify commment for TS_POLLING
ACPI: allow a native cpuidle driver to displace ACPI
cpuidle: make cpuidle_curr_driver static
cpuidle: add cpuidle_unregister_driver() error check
cpuidle: fail to register if !CONFIG_CPU_IDLE -
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (27 commits)
ACPI: Don't let acpi_pad needlessly mark TSC unstable
drivers/acpi/sleep.h: Checkpatch cleanup
ACPI: Minor cleanup eliminating redundant PMTIMER_TICKS to NS conversion
ACPI: delete unused c-state promotion/demotion data strucutures
ACPI: video: fix acpi_backlight=video
ACPI: EC: Use kmemdup
drivers/acpi: use kasprintf
ACPI, APEI, EINJ injection parameters support
Add x64 support to debugfs
ACPI, APEI, Use ERST for persistent storage of MCE
ACPI, APEI, Error Record Serialization Table (ERST) support
ACPI, APEI, Generic Hardware Error Source memory error support
ACPI, APEI, UEFI Common Platform Error Record (CPER) header
Unified UUID/GUID definition
ACPI Hardware Error Device (PNP0C33) support
ACPI, APEI, PCIE AER, use general HEST table parsing in AER firmware_first setup
ACPI, APEI, Document for APEI
ACPI, APEI, EINJ support
ACPI, APEI, HEST table parsing
ACPI, APEI, APEI supporting infrastructure
... -
Commit 38516ab59fbc5b3bb278cf5e1fe2867c70cff32e ("tracing: Let
tracepoints have data passed to tracepoint callbacks") requires this
fixup to the powerpc code.Signed-off-by: Stephen Rothwell
Acked-by: Steven Rostedt
Signed-off-by: Linus Torvalds -
* 'for-linus/2635-updates' of git://git.fluff.org/bjdooks/linux:
ARM: S5PV210: serial: Fix section mismatch warning
ARM: s3c2410_defconfig: Add new machines
ARM: s3c6400_defconfig: Add framebuffer and basic LCD
ARM: s3c6400_defconfig: Add RTC driver support
ARM: s3c6400_defconfig: Enable USB host side
ARM: s3c6400_defconfig: Add SPI driver
ARM: s3c6400_defconfig: Update compiled machines
ARM: S5P: Regoster clk_xusbxti clock for hsotg driver
ARM: S3C64XX: Add USB OTG HCLK to the list of clocks
ARM: SAMSUNG: gpio-cfg.h: update documentation
ARM: SAMSUNG: Documentation: add documentation on GPIO code
ARM: SAMSUNG: Fix documentation for s3c_gpio_cfgpin()
ARM: S3C24XX: Documentation: add section on gpiolib changes
ARM: S3C24XX: Documentation: update GPIO documentation
ARM: S3C24XX: Documentation: update documentation overview
ARM: SAMSUNG: Documentation: update directory layout
ARM: SAMSUNG: Documentation: update the list of SoCs supported -
ARCH_KMALLOC_MINALIGN was already defined in asm/mem-layout.h and so shouldn't
have been added to asm/cache.h as well, but rather altered in place.The commit that added it to asm/cache.h was:
commit 69dcf3db03626c4f18de624e8632454ea12ff260
Author: FUJITA Tomonori
Date: Mon May 24 14:32:54 2010 -0700frv: set ARCH_KMALLOC_MINALIGN
Architectures that handle DMA-non-coherent memory need to set
ARCH_KMALLOC_MINALIGN to make sure that kmalloc'ed buffer is
DMA-safe: the buffer doesn't share a cache with the others.Signed-off-by: David Howells
cc: FUJITA Tomonori
Signed-off-by: Linus Torvalds
28 May, 2010
18 commits
-
Merge branch 'for-2635/defconfig3' into for-linus/2635-updates
-
Add the SMDK2416, and the GTA02 to the list of machines
that are included in the s3c2410_defconfig.Signed-off-by: Ben Dooks
-
Add the framebuffer driver and some basic LCD configurations
that should be suitable for the SMDK boards.Signed-off-by: Ben Dooks
-
Now that the RTC driver supports the S3C64XX, enable
it in the build.Signed-off-by: Ben Dooks
-
Enable the USB Host side by adding the USB OHCI and
some basic USB driver modules.Signed-off-by: Ben Dooks
-
The SPI driver was added last kernel round, so enable
the core SPI and add the 64XX and bitbang driver as
modules.Signed-off-by: Ben Dooks
-
Add the machines that have been added in the last round
to the list of builds.Signed-off-by: Ben Dooks
-
The clk_xusbxti clock is added to the list of clocks to be
registred during boot time clock registration.Signed-off-by: Thomas Abraham
Signed-off-by: Kukjin Kim
[ben-linux@fluff.org: edited title]
Signed-off-by: Ben Dooks -
Add the USB OTG HCLK clock to the list of clocks to be registered
during initialization.Signed-off-by: Thomas Abraham
Signed-off-by: Kukjin Kim
Signed-off-by: Ben Dooks -
Update the documentation on the gpio configuration calls to add more
references to useful information and also to document the values that
are passed.Signed-off-by: Ben Dooks
-
Fix typo in s3c_gpio_cfgpin() documentation, the second argument is @to
not @pin again.Signed-off-by: Ben Dooks
-
We don't name our generic fsync implementations very well currently.
The no-op implementation for in-memory filesystems currently is called
simple_sync_file which doesn't make too much sense to start with,
the the generic one for simple filesystems is called simple_fsync
which can lead to some confusion.This patch renames the generic file fsync method to generic_file_fsync
to match the other generic_file_* routines it is supposed to be used
with, and the no-op implementation to noop_fsync to make it obvious
what to expect. In addition add some documentation for both methods.Signed-off-by: Christoph Hellwig
Signed-off-by: Al Viro -
Signed-off-by: Christoph Hellwig
Signed-off-by: Al Viro -
TS_POLLING set tells the scheduler an idle_task will poll
need_resched() to look for work.TS_POLLING clear tells resched_task() and wake_up_idle_cpu()
that the remote CPU's idle_task is now sleeping in idle,
and thus requires a reschedule interrupt notice work.Update the description of TS_POLLING to reflect how it works.
"idle task polling need_resched, skip sending interrupt"Wordsmithing-by: Milton Miller
Signed-off-by: Len Brown
Acked-by: Peter Zijlstra -
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Fix build breakage -
Add a new driver to support the AB8500 Power Management chip, replacing
the current AB4500. The new driver replaces the old one, instead of an
incremental modification, because this is a substantial overhaul
including:- Split of the driver into -core and -spi portions, to allow another
interface layer to be added- Addition of interrupt support
- Switch to MFD core API for handling subdevices
- Simplification of the APIs to remove a redundant block parameter
- Rename of the APIs and macros from ab4500_* to ab8500_*
- Rename of the files from ab4500* to ab8500*
- Change of the driver name from ab4500 to ab8500
Acked-by: Linus Walleij
Acked-by: Srinidhi Kasagar
Signed-off-by: Rabin Vincent
Signed-off-by: Samuel Ortiz -
This patch adds the i2c board configuration needed for the
Mixed Signal chip AB3550. It also adds the irq numbers needed
for the irq_chip implementation.Signed-off-by: Mattias Wallin
Signed-off-by: Linus Walleij
Signed-off-by: Samuel Ortiz -
The goal here is to make way for a more general interface for the
analog baseband chips ab3100 ab3550 ab550 and future chips.This patch have been divided into two parts since both changing name
and content of a file is not recommended in git.Signed-off-by: Mattias Wallin
Signed-off-by: Linus Walleij
Signed-off-by: Samuel Ortiz
