diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-31 10:44:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-31 10:44:34 -0700 |
| commit | aac422afeffa9093544799c3257a96b55ba42044 (patch) | |
| tree | 054663007601e0b8579021125e798f51869135f5 /arch/parisc/Kconfig | |
| parent | 0c6be87161a6865a6f685a27c6a0404f9d1a0d5e (diff) | |
| parent | b1195c0e3ee1a1ba986923bf3ed8311b7b336432 (diff) | |
Merge tag 'parisc-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6
Pull misc parisc updates from James Bottomley:
"This is a couple of updates to complete our fixes and one to fix a
compile failure caused during the merge window. Additionally, we now
switch to the generic strncopy_from_user."
* tag 'parisc-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
[PARISC] update parisc to use generic strncpy_from_user()
[PARISC] Fix parisc compile failure after smp: Add task_struct argument to __cpu_up()
[PARISC] fix TLB fault path on PA2.0 narrow systems
[PARISC] fix boot failure on 32-bit systems caused by branch stubs placed before .text
Diffstat (limited to 'arch/parisc/Kconfig')
| -rw-r--r-- | arch/parisc/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index ddb8b24b823d..3ff21b536f28 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig @@ -18,6 +18,7 @@ config PARISC select IRQ_PER_CPU select ARCH_HAVE_NMI_SAFE_CMPXCHG select GENERIC_SMP_IDLE_THREAD + select GENERIC_STRNCPY_FROM_USER help The PA-RISC microprocessor is designed by Hewlett-Packard and used |