platform/adaptation/renesas_rcar/renesas_kernel.git
14 years agoBlackfin: kgdb_test: clean up code a bit
Mike Frysinger [Mon, 7 Dec 2009 10:20:20 +0000 (10:20 +0000)]
Blackfin: kgdb_test: clean up code a bit

- document simple global symbols
- convert printk to pr_*
- clean up spurious whitespace
- use min_t()

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: convert kgdbtest to proc_fops
Alexey Dobriyan [Sat, 5 Dec 2009 00:27:29 +0000 (03:27 +0300)]
Blackfin: convert kgdbtest to proc_fops

The read_proc and write_proc interfaces are going to be removed in the
common kernel code.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: convert cyc2ns() to clocksource_cyc2ns()
Mike Frysinger [Fri, 4 Dec 2009 03:32:11 +0000 (03:32 +0000)]
Blackfin: convert cyc2ns() to clocksource_cyc2ns()

The former no longer exists.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: ip0x: pull in asm/portmux.h for P_xxx defines
Mike Frysinger [Thu, 3 Dec 2009 23:37:07 +0000 (23:37 +0000)]
Blackfin: ip0x: pull in asm/portmux.h for P_xxx defines

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: drop unused ax88180 resources
Mike Frysinger [Sun, 15 Nov 2009 07:39:59 +0000 (07:39 +0000)]
Blackfin: drop unused ax88180 resources

The ax88180 driver was never merged, so drop the corresponding resources.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: bf537-stamp: add ADF702x network driver resources
Michael Hennerich [Thu, 12 Nov 2009 16:54:08 +0000 (16:54 +0000)]
Blackfin: bf537-stamp: add ADF702x network driver resources

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: bf537-stamp: add CAN resources
Barry Song [Mon, 2 Nov 2009 07:29:07 +0000 (07:29 +0000)]
Blackfin: bf537-stamp: add CAN resources

Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: bf537-stamp: add AD5258 i2c address
Michael Hennerich [Tue, 17 Nov 2009 10:18:27 +0000 (10:18 +0000)]
Blackfin: bf537-stamp: add AD5258 i2c address

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: bf537-stamp: add adau1761 i2c address
Cliff Cai [Wed, 28 Oct 2009 06:50:36 +0000 (06:50 +0000)]
Blackfin: bf537-stamp: add adau1761 i2c address

Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: bf537-stamp: add adau1371 i2c address
Cliff Cai [Thu, 15 Oct 2009 02:33:04 +0000 (02:33 +0000)]
Blackfin: bf537-stamp: add adau1371 i2c address

Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: bf537-stamp: add ADP8870 resources
Michael Hennerich [Tue, 13 Oct 2009 15:28:33 +0000 (15:28 +0000)]
Blackfin: bf537-stamp: add ADP8870 resources

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: bf537-stamp: kill AD714x board-specific Kconfigs
Mike Frysinger [Mon, 12 Oct 2009 15:56:58 +0000 (15:56 +0000)]
Blackfin: bf537-stamp: kill AD714x board-specific Kconfigs

Include the AD714x SPI/I2C resources based on what is possible.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: bf537-stamp: update ADP5520 resources
Michael Hennerich [Mon, 5 Oct 2009 13:33:11 +0000 (13:33 +0000)]
Blackfin: bf537-stamp: update ADP5520 resources

Matches feedback for driver changes.

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: bf537-stamp: add ADXL346 orientation sensing support
Michael Hennerich [Thu, 29 Oct 2009 13:48:10 +0000 (13:48 +0000)]
Blackfin: bf537-stamp: add ADXL346 orientation sensing support

The ADXL34x driver was updated to include orientation sensing, so have the
bf537-stamp use it by default.

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: bf537-stamp/bf548-ezkit: update ADXL34x resources
Michael Hennerich [Fri, 16 Oct 2009 12:35:20 +0000 (12:35 +0000)]
Blackfin: bf537-stamp/bf548-ezkit: update ADXL34x resources

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: BF51x: unify def/cdef headers
Mike Frysinger [Tue, 17 Nov 2009 06:15:01 +0000 (06:15 +0000)]
Blackfin: BF51x: unify def/cdef headers

Whole lot of duplicated code here just went bye bye.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: BF52x: unify def/cdef headers
Mike Frysinger [Tue, 17 Nov 2009 06:24:51 +0000 (06:24 +0000)]
Blackfin: BF52x: unify def/cdef headers

Whole lot of duplicated code here just went bye bye.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: BF537: push down error masks to avoid namespace pollution
Mike Frysinger [Tue, 3 Nov 2009 09:29:50 +0000 (09:29 +0000)]
Blackfin: BF537: push down error masks to avoid namespace pollution

The error masks are only needed in the BF537 demux error code, so instead
of needing all the short peripheral defines in global space, push these
masks into the one file where they are actually needed.  This fixes a
bunch of define collisions with common code (can/serial/etc...).

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Barry Song <barry.song@analog.com>
14 years agoBlackfin: SMP: don't start up core b until its state has been completely onlined
Yi Li [Wed, 2 Dec 2009 07:58:12 +0000 (07:58 +0000)]
Blackfin: SMP: don't start up core b until its state has been completely onlined

When testing PREEMPT_RT kernel on BF561-EZKit, the kernel blocks while
booting.  When the kernel initializes the ethernet driver, it sleeps and
never wakes up.

The issue happens when the kernel waits for a timer for Core B to timeout
(the timers are per-cpu based: static DEFINE_PER_CPU(struct tvec_base *,
tvec_bases) = &boot_tvec_bases).

However, the ksoftirqd thread for Core B (note, the ksoftirqd thread is
also per-cpu based) cannot work properly, and the timers for Core B never
times out.

When ksoftirqd() for the first time runs on core B, it is possible core A
is still initializing core B (see smp_init() -> cpu_up() -> __cpu_up()).
So the "cpu_is_offline()" check may return true and ksoftirqd moves to
"wait_to_die".

So delay the core b start up until the per-cpu timers have been set up
fully.

Signed-off-by: Yi Li <yi.li@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: convert to asm-generic pci headers
Barry Song [Wed, 25 Nov 2009 03:02:58 +0000 (03:02 +0000)]
Blackfin: convert to asm-generic pci headers

Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: io.h: fix random busted whitespace
Mike Frysinger [Mon, 30 Nov 2009 18:41:58 +0000 (18:41 +0000)]
Blackfin: io.h: fix random busted whitespace

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: dma-mapping.h: flesh out missing DMA mapping functions
Barry Song [Mon, 23 Nov 2009 03:47:24 +0000 (03:47 +0000)]
Blackfin: dma-mapping.h: flesh out missing DMA mapping functions

Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: workaround anomaly 05000310
Barry Song [Fri, 27 Nov 2009 09:18:21 +0000 (09:18 +0000)]
Blackfin: workaround anomaly 05000310

While fetching instructions at the boundary of L1 instruction SRAM, a false
External Memory Addressing Error might be triggered.  We should ignore this
and continue on our way to avoid random crashes.

Because hardware errors are not exact in the Blackfin architecture, we need
to catch a few more common cases when the code flow changes and the signal
is finally delivered.

Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: drop ptrace() write support for fixed code/bootrom
Mike Frysinger [Wed, 25 Nov 2009 05:39:03 +0000 (05:39 +0000)]
Blackfin: drop ptrace() write support for fixed code/bootrom

These regions are either read-only and won't work anyways (bootrom), or
we don't want people screwing with them because they're shared between
all processes (fixed code).

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: MPU: support XIP in async flash memory
Barry Song [Wed, 2 Dec 2009 02:50:43 +0000 (02:50 +0000)]
Blackfin: MPU: support XIP in async flash memory

The NOMPU code already supported executing in the async banks, so this
brings the MPU code in line.

Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: drop 4KB reserve at end of memory
Barry Song [Fri, 27 Nov 2009 04:37:52 +0000 (04:37 +0000)]
Blackfin: drop 4KB reserve at end of memory

The point of this small chunk was to avoid anomaly 05000310.  This never
really seemed to do what it was intended though -- no valid CPLBs exist
over the reserved memory, and there is often memory before it anyways (due
to the uClinux MTD and/or reserved DMA region).  Plus, it doesn't address
the L1 instruction case.

So drop this chunk as it wastes memory and is affront to humanity.

Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: support smaller uncached DMA chunks for memory constrained systems
Barry Song [Wed, 2 Dec 2009 09:13:36 +0000 (09:13 +0000)]
Blackfin: support smaller uncached DMA chunks for memory constrained systems

When working with 8 meg systems, forcing a 1 meg DMA chunk heavily cuts
into the available resources.  So support smaller chunks to better cover
needs for these systems.

Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: push BF5Xx configs down into mach-specific Kconfigs
Mike Frysinger [Mon, 16 Nov 2009 23:49:41 +0000 (23:49 +0000)]
Blackfin: push BF5Xx configs down into mach-specific Kconfigs

While we're moving the BF54x code, have the BF54xM variants select the
normal BF54x values so that the rest of the Kconfig tree doesn't need to
check the BF54xM variant everytime it wants to check the BF54x.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: finish_atomic_sections: optimize the RTS step
Mike Frysinger [Thu, 19 Nov 2009 19:15:26 +0000 (19:15 +0000)]
Blackfin: finish_atomic_sections: optimize the RTS step

No point in returning to userspace just to have it immediately perform the
RTS step.  We have to update the PC anyways, so do the RTS too.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: kgdb: punt dead code
Sonic Zhang [Mon, 23 Nov 2009 06:07:53 +0000 (06:07 +0000)]
Blackfin: kgdb: punt dead code

None of these vars/funcs were being used.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: reject NULL callback in set_dma_callback()
Mike Frysinger [Tue, 24 Nov 2009 18:36:36 +0000 (18:36 +0000)]
Blackfin: reject NULL callback in set_dma_callback()

It makes no sense to call this function with a NULL callback.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agobfin-otp: add BF51x to the supported arch list
Mike Frysinger [Fri, 20 Nov 2009 19:09:56 +0000 (19:09 +0000)]
bfin-otp: add BF51x to the supported arch list

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: punt dead/unused flash mem_init settings
Mike Frysinger [Sun, 15 Nov 2009 07:42:34 +0000 (07:42 +0000)]
Blackfin: punt dead/unused flash mem_init settings

I don't think these defines were ever used.  At any rate, we have common
bit defines for all parts as well as a Kconfig option to declare the EBIU
async timings, and no one has really complained about this so far.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: gptimers: use unsigned timer/group ids
Mike Frysinger [Sun, 15 Nov 2009 07:35:22 +0000 (07:35 +0000)]
Blackfin: gptimers: use unsigned timer/group ids

Since we always use these ids as unsigned values, and we have some assert
code to make sure they don't exceed a limit, avoid signed issues.

Reported-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: don't walk VMAs when oopsing
Robin Getz [Thu, 5 Nov 2009 15:44:44 +0000 (15:44 +0000)]
Blackfin: don't walk VMAs when oopsing

If we're double faulting, then we have to assume the VMAs are not safe as
broken pointers here will prevent full trace output for the double fault.
Shouldn't be a big problem though as rarely is a double fault caused by
code in userspace.

Signed-off-by: Robin Getz <robin.getz@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: force BFD target when linking modules
Mike Frysinger [Fri, 30 Oct 2009 04:30:54 +0000 (04:30 +0000)]
Blackfin: force BFD target when linking modules

This allows us to use any Blackfin toolchain to create kernel modules
(such as the FDPIC bfin-linux-uclibc toolchain).

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: comment the FDPIC PTRACE defines
Mike Frysinger [Thu, 29 Oct 2009 11:37:24 +0000 (11:37 +0000)]
Blackfin: comment the FDPIC PTRACE defines

This matches similar documentation for the FRV FDPIC code.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin/ipipe: update version stamp
Philippe Gerum [Tue, 27 Oct 2009 21:05:34 +0000 (22:05 +0100)]
Blackfin/ipipe: update version stamp

Signed-off-by: Philippe Gerum <rpm@xenomai.org>
Signed-off-by: Li Yi <yi.li@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin/ipipe: introduce support for CONFIG_MPU
Philippe Gerum [Tue, 27 Oct 2009 21:05:33 +0000 (22:05 +0100)]
Blackfin/ipipe: introduce support for CONFIG_MPU

Signed-off-by: Philippe Gerum <rpm@xenomai.org>
Signed-off-by: Li Yi <yi.li@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin/ipipe: fix forward ref to barrier()
Philippe Gerum [Tue, 27 Oct 2009 21:05:32 +0000 (22:05 +0100)]
Blackfin/ipipe: fix forward ref to barrier()

Signed-off-by: Philippe Gerum <rpm@xenomai.org>
Signed-off-by: Li Yi <yi.li@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin/ipipe: prepare status bitops for SMP support
Philippe Gerum [Tue, 27 Oct 2009 21:05:31 +0000 (22:05 +0100)]
Blackfin/ipipe: prepare status bitops for SMP support

Signed-off-by: Philippe Gerum <rpm@xenomai.org>
Signed-off-by: Li Yi <yi.li@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: add support for the Acvilon BF561 board
Valentin Yakovenkov [Tue, 27 Oct 2009 07:06:34 +0000 (07:06 +0000)]
Blackfin: add support for the Acvilon BF561 board

Signed-off-by: Valentin Yakovenkov <yakovenkov@gmail.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: add an uncompressed vmImage target
Mike Frysinger [Mon, 26 Oct 2009 21:16:04 +0000 (21:16 +0000)]
Blackfin: add an uncompressed vmImage target

This is useful for quick tests where networks are faster than compression,
and/or the compression code is broken.

Reported-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: don't give CPU its own line in traps output
Mike Frysinger [Thu, 22 Oct 2009 10:14:53 +0000 (10:14 +0000)]
Blackfin: don't give CPU its own line in traps output

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: add an example showing how to use the gptimers API
Mike Frysinger [Wed, 21 Oct 2009 21:22:35 +0000 (21:22 +0000)]
Blackfin: add an example showing how to use the gptimers API

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: announce current cpu rev when booting
Robin Getz [Tue, 20 Oct 2009 17:22:18 +0000 (17:22 +0000)]
Blackfin: announce current cpu rev when booting

User reports rarely include full information, so include this important
tidbit up front.  It's also good to know at a glance in general.

Signed-off-by: Robin Getz <robin.getz@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: unify DMA masks
Mike Frysinger [Tue, 20 Oct 2009 17:20:21 +0000 (17:20 +0000)]
Blackfin: unify DMA masks

Every Blackfin variant has the same DMA bit masks, so avoid duplicating
them over and over in each mach header.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: fix typo in isp1760 platform name
Michael Hennerich [Thu, 15 Oct 2009 10:37:33 +0000 (10:37 +0000)]
Blackfin: fix typo in isp1760 platform name

The driver changed from "isp1760-hcd" to "isp1760", so update resources
to match.

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: unify duplicated power masks
Mike Frysinger [Thu, 15 Oct 2009 06:47:28 +0000 (06:47 +0000)]
Blackfin: unify duplicated power masks

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: pull in asm/dpmc.h for power defines
Mike Frysinger [Thu, 15 Oct 2009 17:12:05 +0000 (17:12 +0000)]
Blackfin: pull in asm/dpmc.h for power defines

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: H8606/ip0x: drop redundant SPI ctl_reg settings
Mike Frysinger [Thu, 15 Oct 2009 04:13:18 +0000 (04:13 +0000)]
Blackfin: H8606/ip0x: drop redundant SPI ctl_reg settings

No need to set MSTR in .ctl_reg as the Blackfin SPI bus driver does this
already for all parts.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: BF54x: punt useless "masks" for count/address MMRs
Mike Frysinger [Thu, 15 Oct 2009 03:57:04 +0000 (03:57 +0000)]
Blackfin: BF54x: punt useless "masks" for count/address MMRs

There's no point in having mask defines when the entire MMR value is a
count or address.  i.e. applying a mask of -1 is pointless.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: punt unused MXVR masks
Mike Frysinger [Thu, 15 Oct 2009 03:51:30 +0000 (03:51 +0000)]
Blackfin: punt unused MXVR masks

There are no MXVR device drivers, and if someday there is, we can put
these in a dedicated header rather than polluting the global namespace.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: punt OTP MMRs
Mike Frysinger [Thu, 15 Oct 2009 03:45:47 +0000 (03:45 +0000)]
Blackfin: punt OTP MMRs

People should not be accessing OTP MMRs directly.  They should instead go
through the Blackfin ROM helper functions.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: BF51x: dump non-existent SPI/NFC MMRs
Mike Frysinger [Thu, 15 Oct 2009 03:41:42 +0000 (03:41 +0000)]
Blackfin: BF51x: dump non-existent SPI/NFC MMRs

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: scrub unused watchdog mmr masks
Mike Frysinger [Thu, 15 Oct 2009 03:14:09 +0000 (03:14 +0000)]
Blackfin: scrub unused watchdog mmr masks

The watchdog code doesn't need these, and the other parts had these
punted, so keep the global namespace clean.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: scrub unused RTC masks
Mike Frysinger [Thu, 15 Oct 2009 03:10:38 +0000 (03:10 +0000)]
Blackfin: scrub unused RTC masks

The RTC driver code doesn't need these, and the other parts had these
punted, so keep the global namespace clean.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: unify BF547/8/9 headers
Mike Frysinger [Tue, 20 Oct 2009 17:30:58 +0000 (17:30 +0000)]
Blackfin: unify BF547/8/9 headers

No point in duplicating entire lists when we can simply tail into other
parts for most of the MMRs.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: fix some BF547 header copy & paste typos
Mike Frysinger [Tue, 20 Oct 2009 18:31:46 +0000 (18:31 +0000)]
Blackfin: fix some BF547 header copy & paste typos

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: rename BF542 host dma defines
Mike Frysinger [Thu, 15 Oct 2009 04:22:21 +0000 (04:22 +0000)]
Blackfin: rename BF542 host dma defines

All the other BF54x parts had these defines renamed to avoid collision,
but it looks the BF542 was missed somehow.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: punt cache lock documentation
Michael Hennerich [Wed, 14 Oct 2009 13:43:53 +0000 (13:43 +0000)]
Blackfin: punt cache lock documentation

The cache lock code was unused and punted, so punt the documentation too.

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: coreb: switched to unlocked_ioctl
Mike Frysinger [Tue, 13 Oct 2009 12:50:05 +0000 (12:50 +0000)]
Blackfin: coreb: switched to unlocked_ioctl

We don't need the BKL and now people will stop looking at this.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: convert DMA mutex to an atomic and drop redundant code
Mike Frysinger [Fri, 9 Oct 2009 22:18:12 +0000 (22:18 +0000)]
Blackfin: convert DMA mutex to an atomic and drop redundant code

The DMA channel status field was encoding redundant info wrt the DMA MMR
config register, and it was doing an incomplete job of checking all DMA
channels (some drivers write directly to the config register).  So drop
the tristate field in favor of a binary atomic field.  This simplifies
the code in general, removes the implicit need for sleeping, and forces
the suspend code to handle all channels properly.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: update bfin_rotary defines
Michael Hennerich [Fri, 9 Oct 2009 07:37:03 +0000 (07:37 +0000)]
Blackfin: update bfin_rotary defines

The driver was moved during the merge process, so update the defines to
match the new location.

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: push down asm/ includes and out of bfin-global.h
Mike Frysinger [Fri, 9 Oct 2009 07:34:00 +0000 (07:34 +0000)]
Blackfin: push down asm/ includes and out of bfin-global.h

Avoid including unnecessary headers all the time as well as circular
includes with core requirements.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: pull in firmware Kconfig
Mike Frysinger [Tue, 6 Oct 2009 04:49:07 +0000 (04:49 +0000)]
Blackfin: pull in firmware Kconfig

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: BF51x/BF52x: fill out bfin_clear_PPI_STATUS()
Mike Frysinger [Wed, 30 Sep 2009 01:21:13 +0000 (01:21 +0000)]
Blackfin: BF51x/BF52x: fill out bfin_clear_PPI_STATUS()

All the arches define a helper macro to make things easy for driver code.

Reported-by: Frank Van Hooft <frank@frankvh.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: bf537-stamp: need io.h for writeb() funcs
Barry Song [Tue, 29 Sep 2009 03:01:40 +0000 (03:01 +0000)]
Blackfin: bf537-stamp: need io.h for writeb() funcs

Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: bf538: add support for extended GPIO banks
Michael Hennerich [Mon, 28 Sep 2009 12:23:41 +0000 (12:23 +0000)]
Blackfin: bf538: add support for extended GPIO banks

The GPIOs on ports C/D/E on the BF538/BF539 do not behave the same way as
the other ports on the part and the same way as all other Blackfin parts.
The MMRs are programmed slightly different and they cannot be used to
generate interrupts or wakeup a sleeping system.  Since these guys don't
fit into the existing code, create a simple gpiolib driver for them.

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: add C define of trace_buffer_init()
Graf Yang [Mon, 28 Sep 2009 09:23:05 +0000 (09:23 +0000)]
Blackfin: add C define of trace_buffer_init()

Have the C API trace funcs match the assembly API trace funcs.

Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: cpufreq: use a constant latency
Michael Hennerich [Fri, 25 Sep 2009 09:03:21 +0000 (09:03 +0000)]
Blackfin: cpufreq: use a constant latency

PLL_LOCKCNT applies only to the PLL programming sequence which does not
apply to core and system clock dividers.  Writes to PLL_DIV to change the
CSEL/SSEL dividers take effect immediately.

There is still overhead in software in writing the new dividers, so just
use a value of 50us as this should be good enough.

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: clean up isp1362 board resources
Mike Frysinger [Thu, 24 Sep 2009 05:44:36 +0000 (05:44 +0000)]
Blackfin: clean up isp1362 board resources

Drop the CONFIG_USB_ISP1362_BFIN_GPIO_IRQ Kconfig as it never made it into
mainline and it was a bad interface into the board resources.  For boards
that actually used this, replace it with an actual IRQ define.  For boards
that didn't, simply drop the resources.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: calculate on-chip lengths at link time rather than run time
Mike Frysinger [Wed, 23 Sep 2009 20:34:48 +0000 (20:34 +0000)]
Blackfin: calculate on-chip lengths at link time rather than run time

Since the link sizes never change at runtime, push the calculation out to
the linker script to save some useless calculation costs.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: improve async bank access checking (for cross-banks & XIP)
Bernd Schmidt [Wed, 23 Sep 2009 16:47:16 +0000 (16:47 +0000)]
Blackfin: improve async bank access checking (for cross-banks & XIP)

The access_ok() function did not accept ranges within the async banks
which made it impossible to do XIP in flash.  Fixing that also showed
that the current bfin_mem_access_type() code did not work with accesses
that spanned async banks (like a file system).  So split out and fix the
async bank checks so that all these scenarios work as expected.

Signed-off-by: Bernd Schmidt <bernds_cb1@t-online.de>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: convert DMA code to a proper bitmap
Michael Hennerich [Wed, 23 Sep 2009 11:32:52 +0000 (11:32 +0000)]
Blackfin: convert DMA code to a proper bitmap

Rather than using our own data structures that basically boil down to a
bitmap, use the standard bitmap functions.

Reported-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: clean up bf537-lq035 board resources
Michael Hennerich [Tue, 22 Sep 2009 15:36:55 +0000 (15:36 +0000)]
Blackfin: clean up bf537-lq035 board resources

Now that the driver has been updated, convert the board resources to the
new i2c framework for managing slaves.

For boards that don't actually hook up to this hardware, simply drop the
resources altogether.

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: add some bounds checking to peripheral_request
Barry Song [Wed, 16 Sep 2009 04:36:29 +0000 (04:36 +0000)]
Blackfin: add some bounds checking to peripheral_request

The requested peripheral is turned into an index into some state arrays,
so make sure the calculated index doesn't exceed the index.  This occurs
when using bogus pin values or the define headers are screwed up.  Now
we'll notice right away that something needs fixing instead of trying to
track down random memory corruption.

Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: use common code for cycle->nanosecond conversion
Yi Li [Tue, 15 Sep 2009 08:55:47 +0000 (08:55 +0000)]
Blackfin: use common code for cycle->nanosecond conversion

No point in redefining things that common code already does for us.  Also
use CYC2NS_SCALE_FACTOR to better reflect reality and for better precision.

Signed-off-by: Yi Li <yi.li@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: unify sched_clock() handling between clock sources
Yi Li [Tue, 15 Sep 2009 06:50:51 +0000 (06:50 +0000)]
Blackfin: unify sched_clock() handling between clock sources

Currently sched_clock() is only defined when using CYCLES as a clock
source.  Declare sched_clock() in common code and mark it with notrace to
prevent invoking sched_clock() recursively (because ftrace uses
sched_clock() to record time).

Signed-off-by: Yi Li <yi.li@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: fix gptimer0 clock source compile warning
Yi Li [Tue, 15 Sep 2009 02:08:50 +0000 (02:08 +0000)]
Blackfin: fix gptimer0 clock source compile warning

Some of the clocksource prototypes were updated, but the gptimer0 func was
missed in the process.  Not a big issue as the argument is ignored, but we
should fix the compile warning anyways.

Signed-off-by: Yi Li <yi.li@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: update defconfigs
Mike Frysinger [Tue, 23 Jun 2009 13:43:06 +0000 (13:43 +0000)]
Blackfin: update defconfigs

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Yi Li <yi.li@analog.com>
Signed-off-by: Harald Krapfenbauer <Harald.Krapfenbauer@bluetechnix.at>
Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: convert to generic checksum code
Mike Frysinger [Sat, 13 Jun 2009 11:42:58 +0000 (07:42 -0400)]
Blackfin: convert to generic checksum code

The Blackfin port only implemented an optimized version of the
csum_tcpudp_nofold function, so convert everything else to the new
generic code.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoMerge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
Linus Torvalds [Mon, 14 Dec 2009 20:50:25 +0000 (12:50 -0800)]
Merge branch 'for_linus' of git://git./linux/kernel/git/jack/linux-udf-2.6

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
  udf: Avoid IO in udf_clear_inode
  udf: Try harder when looking for VAT inode
  udf: Fix compilation with UDFFS_DEBUG enabled

14 years agoudf: Avoid IO in udf_clear_inode
Jan Kara [Thu, 3 Dec 2009 12:39:28 +0000 (13:39 +0100)]
udf: Avoid IO in udf_clear_inode

It is not very good to do IO in udf_clear_inode. First, VFS does not really
expect inode to become dirty there and thus we have to write it ourselves,
second, memory reclaim gets blocked waiting for IO when it does not really
expect it, third, the IO pattern (e.g. on umount) resulting from writes in
udf_clear_inode is bad and it slows down writing a lot.

The reason why UDF needed to do IO in udf_clear_inode is that UDF standard
mandates extent length to exactly match inode size. But when we allocate
extents to a file or directory, we don't really know what exactly the final
file size will be and thus temporarily set it to block boundary and later
truncate it to exact length in udf_clear_inode. Now, this is changed to
truncate to final file size in udf_release_file for regular files. For
directories and symlinks, we do the truncation at the moment when learn
what the final file size will be.

Signed-off-by: Jan Kara <jack@suse.cz>
14 years agoudf: Try harder when looking for VAT inode
Jan Kara [Mon, 30 Nov 2009 18:47:55 +0000 (19:47 +0100)]
udf: Try harder when looking for VAT inode

Some disks do not contain VAT inode in the last recorded block as required
by the standard but a few blocks earlier (or the number of recorded blocks
is wrong). So look for the VAT inode a bit before the end of the media.

Signed-off-by: Jan Kara <jack@suse.cz>
14 years agoudf: Fix compilation with UDFFS_DEBUG enabled
Jan Kara [Mon, 30 Nov 2009 18:47:10 +0000 (19:47 +0100)]
udf: Fix compilation with UDFFS_DEBUG enabled

Signed-off-by: Jan Kara <jack@suse.cz>
14 years agoMerge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Mon, 14 Dec 2009 20:36:46 +0000 (12:36 -0800)]
Merge branch 'x86-fixes-for-linus' of git://git./linux/kernel/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, mce: Clean up thermal init by introducing intel_thermal_supported()
  x86, mce: Thermal monitoring depends on APIC being enabled
  x86: Gart: fix breakage due to IOMMU initialization cleanup
  x86: Move swiotlb initialization before dma32_free_bootmem
  x86: Fix build warning in arch/x86/mm/mmio-mod.c
  x86: Remove usedac in feature-removal-schedule.txt
  x86: Fix duplicated UV BAU interrupt vector
  nvram: Fix write beyond end condition; prove to gcc copy is safe
  mm: Adjust do_pages_stat() so gcc can see copy_from_user() is safe
  x86: Limit the number of processor bootup messages
  x86: Remove enabling x2apic message for every CPU
  doc: Add documentation for bootloader_{type,version}
  x86, msr: Add support for non-contiguous cpumasks
  x86: Use find_e820() instead of hard coded trampoline address
  x86, AMD: Fix stale cpuid4_info shared_map data in shared_cpu_map cpumasks

Trivial percpu-naming-introduced conflicts in arch/x86/kernel/cpu/intel_cacheinfo.c

14 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
Linus Torvalds [Mon, 14 Dec 2009 20:33:02 +0000 (12:33 -0800)]
Merge git://git./linux/kernel/git/brodo/pcmcia-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  pcmcia: CodingStyle fixes
  pcmcia: remove unused IRQ_FIRST_SHARED

14 years agoMerge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
Linus Torvalds [Mon, 14 Dec 2009 18:22:11 +0000 (10:22 -0800)]
Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6

* 'next-spi' of git://git.secretlab.ca/git/linux-2.6: (23 commits)
  spi: fix probe/remove section markings
  Add OMAP spi100k driver
  spi-imx: don't access struct device directly but use dev_get_platdata
  spi-imx: Add mx25 support
  spi-imx: use positive logic to distinguish cpu variants
  spi-imx: correct check for platform_get_irq failing
  ARM: NUC900: Add spi driver support for nuc900
  spi: SuperH MSIOF SPI Master driver V2
  spi: fix spidev compilation failure when VERBOSE is defined
  spi/au1550_spi: fix setupxfer not to override cfg with zeros
  spi/mpc8xxx: don't use __exit_p to wrap plat_mpc8xxx_spi_remove
  spi/i.MX: fix broken error handling for gpio_request
  spi/i.mx: drain MXC SPI transfer buffer when probing device
  MAINTAINERS: add SPI co-maintainer.
  spi/xilinx_spi: fix incorrect casting
  spi/mpc52xx-spi: minor cleanups
  xilinx_spi: add a platform driver using the xilinx_spi common module.
  xilinx_spi: add support for the DS570 IP.
  xilinx_spi: Switch to iomem functions and support little endian.
  xilinx_spi: Split into of driver and generic part.
  ...

14 years agoMerge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Mon, 14 Dec 2009 18:13:22 +0000 (10:13 -0800)]
Merge branch 'perf-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf sched: Fix build failure on sparc
  perf bench: Add "all" pseudo subsystem and "all" pseudo suite
  perf tools: Introduce perf_session class
  perf symbols: Ditch dso->find_symbol
  perf symbols: Allow lookups by symbol name too
  perf symbols: Add missing "Variables" entry to map_type__name
  perf symbols: Add support for 'variable' symtabs
  perf symbols: Introduce ELF counterparts to symbol_type__is_a
  perf symbols: Introduce symbol_type__is_a
  perf symbols: Rename kthreads to kmaps, using another abstraction for it
  perf tools: Allow building for ARM
  hw-breakpoints: Handle bad modify_user_hw_breakpoint off-case return value
  perf tools: Allow cross compiling
  tracing, slab: Fix no callsite ifndef CONFIG_KMEMTRACE
  tracing, slab: Define kmem_cache_alloc_notrace ifdef CONFIG_TRACING

Trivial conflict due to different fixes to modify_user_hw_breakpoint()
in include/linux/hw_breakpoint.h

14 years agoPCI: Global variable decls must match the defs in section attributes
David Howells [Mon, 14 Dec 2009 14:13:44 +0000 (14:13 +0000)]
PCI: Global variable decls must match the defs in section attributes

Global variable declarations must match the definitions in section attributes
as the compiler is at liberty to vary the method it uses to access a variable,
depending on the section it is in.

When building the FRV arch, I now see:

  drivers/built-in.o: In function `pci_apply_final_quirks':
  drivers/pci/quirks.c:2606: relocation truncated to fit: R_FRV_GPREL12 against symbol `pci_dfl_cache_line_size' defined in .devinit.data section in drivers/built-in.o
  drivers/pci/quirks.c:2623: relocation truncated to fit: R_FRV_GPREL12 against symbol `pci_dfl_cache_line_size' defined in .devinit.data section in drivers/built-in.o
  drivers/pci/quirks.c:2630: relocation truncated to fit: R_FRV_GPREL12 against symbol `pci_dfl_cache_line_size' defined in .devinit.data section in drivers/built-in.o

because the declaration of pci_dfl_cache_line_size in linux/pci.h does not
match the definition in drivers/pci/pci.c.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
14 years agoFRV: Fix no-hardware-breakpoint case
David Howells [Mon, 14 Dec 2009 14:03:27 +0000 (14:03 +0000)]
FRV: Fix no-hardware-breakpoint case

If there is no hardware breakpoint support, modify_user_hw_breakpoint()
tries to return a NULL pointer through as an 'int' return value:

  In file included from kernel/exit.c:53:
  include/linux/hw_breakpoint.h: In function 'modify_user_hw_breakpoint':
  include/linux/hw_breakpoint.h:96: warning: return makes integer from pointer without a cast

Return 0 instead.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
14 years agoMerge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze
Linus Torvalds [Mon, 14 Dec 2009 18:04:04 +0000 (10:04 -0800)]
Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze

* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (46 commits)
  microblaze: Remove rt_sigsuspend wrapper
  microblaze: nommu: Don't clobber R11 on syscalls
  microblaze: Remove show_tmem function
  microblaze: Support for WB cache
  microblaze: Add PVR for Microblaze v7.30.a
  microblaze: Remove ancient and fake microblaze version from cpu_ver table
  microblaze: Remove panic_timeout init value
  microblaze: Do not count system calls in default
  microblaze: Enable DTC compilation
  microblaze: Core oprofile configs and hooks
  microblaze: Fix level interrupt ACKing
  microblaze: Enable futimesat syscall
  microblaze: Checking DTS against PVR for write-back cache
  microblaze: Remove duplicity from pgalloc.h
  microblaze: Futex support
  microblaze: Adding dev_arch_data functions
  microblaze: Fix the heartbeat gpio to be more robust
  microblaze: Simple __copy_tofrom_user for noMMU
  microblaze: Export memory_start for modules
  microblaze: Use lowest-common-denominator default CPU settings
  ...

14 years agoMerge branch 'for-linus' of git://neil.brown.name/md
Linus Torvalds [Mon, 14 Dec 2009 18:03:36 +0000 (10:03 -0800)]
Merge branch 'for-linus' of git://neil.brown.name/md

* 'for-linus' of git://neil.brown.name/md: (27 commits)
  md: add 'recovery_start' per-device sysfs attribute
  md: rcu_read_lock() walk of mddev->disks in md_do_sync()
  md: integrate spares into array at earliest opportunity.
  md: move compat_ioctl handling into md.c
  md: revise Kconfig help for MD_MULTIPATH
  md: add MODULE_DESCRIPTION for all md related modules.
  raid: improve MD/raid10 handling of correctable read errors.
  md/raid10: print more useful messages on device failure.
  md/bitmap: update dirty flag when bitmap bits are explicitly set.
  md: Support write-intent bitmaps with externally managed metadata.
  md/bitmap: move setting of daemon_lastrun out of bitmap_read_sb
  md: support updating bitmap parameters via sysfs.
  md: factor out parsing of fixed-point numbers
  md: support bitmap offset appropriate for external-metadata arrays.
  md: remove needless setting of thread->timeout in raid10_quiesce
  md: change daemon_sleep to be in 'jiffies' rather than 'seconds'.
  md: move offset, daemon_sleep and chunksize out of bitmap structure
  md: collect bitmap-specific fields into one structure.
  md/raid1: add takeover support for raid5->raid1
  md: add honouring of suspend_{lo,hi} to raid1.
  ...

14 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
Linus Torvalds [Mon, 14 Dec 2009 18:02:35 +0000 (10:02 -0800)]
Merge branch 'for-next' of git://git./linux/kernel/git/sameo/mfd-2.6

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (58 commits)
  mfd: Add twl6030 regulator subdevices
  regulator: Add support for twl6030 regulators
  rtc: Add twl6030 RTC support
  mfd: Add support for twl6030 irq framework
  mfd: Rename twl4030_ routines in twl-regulator.c
  mfd: Rename twl4030_ routines in rtc-twl.c
  mfd: Rename all twl4030_i2c*
  mfd: Rename twl4030* driver files to enable re-use
  mfd: Clarify twl4030 return value for read and write
  mfd: Add all twl4030 regulators to the twl4030 mfd driver
  mfd: Don't set mc13783 ADREFMODE for touch conversions
  mfd: Remove ezx-pcap defines for custom led gpio encoding
  mfd: Near complete mc13783 rewrite
  mfd: Remove build time warning for WM835x register default tables
  mfd: Force I2C to be built in when building WM831x
  mfd: Don't allow wm831x to be built as a module
  mfd: Fix incorrect error check for wm8350-core
  mfd: Fix twl4030 warning
  gpiolib: Implement gpio_to_irq() for wm831x
  mfd: Remove default selection of AB4500
  ...

14 years agoMerge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Mon, 14 Dec 2009 18:01:15 +0000 (10:01 -0800)]
Merge branch 'devel' of /home/rmk/linux-2.6-arm

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: fix lh7a40x build
  ARM: fix sa1100 build
  ARM: fix clps711x, footbridge, integrator, ixp2000, ixp2300 and s3c build bug
  ARM: VFP: fix vfp thread init bug and document vfp notifier entry conditions
  ARM: pxa: fix now incorrect reference of skt->irq by using skt->socket.pci_irq
  [ARM] pxa/zeus: default configuration for Arcom Zeus SBC.
  [ARM] pxa/zeus: make Viper pcmcia support more generic to support Zeus
  [ARM] pxa/zeus: basic support for Arcom Zeus SBC
  [ARM] pxa/em-x270: fix usb hub power up/reset sequence
  PCMCIA: fix pxa2xx_lubbock modular build error
  ARM: RealView: Fix typo in the RealView/PBX Kconfig entry
  ARM: Do not allow the probing of the local timer
  ARM: Add an earlyprintk debug console

14 years agoMerge git://git.linux-nfs.org/projects/trondmy/nfs-2.6
Linus Torvalds [Mon, 14 Dec 2009 18:00:24 +0000 (10:00 -0800)]
Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6

* git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (75 commits)
  NFS: Fix nfs_migrate_page()
  rpc: remove unneeded function parameter in gss_add_msg()
  nfs41: Invoke RECLAIM_COMPLETE on all new client ids
  SUNRPC: IS_ERR/PTR_ERR confusion
  NFSv41: Fix a potential state leakage when restarting nfs4_close_prepare
  nfs41: Handle NFSv4.1 session errors in the delegation recall code
  nfs41: Retry delegation return if it failed with session error
  nfs41: Handle session errors during delegation return
  nfs41: Mark stateids in need of reclaim if state manager gets stale clientid
  NFS: Fix up the declaration of nfs4_restart_rpc when NFSv4 not configured
  nfs41: Don't clear DRAINING flag on NFS4ERR_STALE_CLIENTID
  nfs41: nfs41_setup_state_renewal
  NFSv41: More cleanups
  NFSv41: Fix up some bugs in the NFS4CLNT_SESSION_DRAINING code
  NFSv41: Clean up slot table management
  NFSv41: Fix nfs4_proc_create_session
  nfs41: Invoke RECLAIM_COMPLETE
  nfs41: RECLAIM_COMPLETE functionality
  nfs41: RECLAIM_COMPLETE XDR functionality
  Cleanup some NFSv4 XDR decode comments
  ...

14 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
Linus Torvalds [Mon, 14 Dec 2009 17:58:24 +0000 (09:58 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/tj/percpu

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (34 commits)
  m68k: rename global variable vmalloc_end to m68k_vmalloc_end
  percpu: add missing per_cpu_ptr_to_phys() definition for UP
  percpu: Fix kdump failure if booted with percpu_alloc=page
  percpu: make misc percpu symbols unique
  percpu: make percpu symbols in ia64 unique
  percpu: make percpu symbols in powerpc unique
  percpu: make percpu symbols in x86 unique
  percpu: make percpu symbols in xen unique
  percpu: make percpu symbols in cpufreq unique
  percpu: make percpu symbols in oprofile unique
  percpu: make percpu symbols in tracer unique
  percpu: make percpu symbols under kernel/ and mm/ unique
  percpu: remove some sparse warnings
  percpu: make alloc_percpu() handle array types
  vmalloc: fix use of non-existent percpu variable in put_cpu_var()
  this_cpu: Use this_cpu_xx in trace_functions_graph.c
  this_cpu: Use this_cpu_xx for ftrace
  this_cpu: Use this_cpu_xx in nmi handling
  this_cpu: Use this_cpu operations in RCU
  this_cpu: Use this_cpu ops for VM statistics
  ...

Fix up trivial (famous last words) global per-cpu naming conflicts in
arch/x86/kvm/svm.c
mm/slab.c

14 years agoDocumentation: rw_lock lessons learned
William Allen Simpson [Sun, 13 Dec 2009 20:12:46 +0000 (15:12 -0500)]
Documentation: rw_lock lessons learned

In recent months, two different network projects erroneously
strayed down the rw_lock path.  Update the Documentation
based upon comments by Eric Dumazet and Paul E. McKenney in
those threads.

Further updates await somebody else with more expertise.

Changes:
  - Merged with extensive content by Stephen Hemminger.
  - Fix one of the comments by Linus Torvalds.

Signed-off-by: William.Allen.Simpson@gmail.com
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
14 years agox86, mce: Clean up thermal init by introducing intel_thermal_supported()
Hidetoshi Seto [Mon, 14 Dec 2009 08:57:00 +0000 (17:57 +0900)]
x86, mce: Clean up thermal init by introducing intel_thermal_supported()

It looks better to have a common function. No change in functionality.

Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
LKML-Reference: <4B25FDDC.407@jp.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: Cyrill Gorcunov <gorcunov@openvz.org>