diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 01:11:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 01:11:30 -0400 |
commit | 45c091bb2d453ce4a8b06cf19872ec7a77fc4799 (patch) | |
tree | 06fb2e05518ebfba163f8424e028e7faf5672d66 /arch/um/sys-ppc | |
parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) | |
parent | 2191fe3e39159e3375f4b7ec1420df149f154101 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (139 commits)
[POWERPC] re-enable OProfile for iSeries, using timer interrupt
[POWERPC] support ibm,extended-*-frequency properties
[POWERPC] Extra sanity check in EEH code
[POWERPC] Dont look for class-code in pci children
[POWERPC] Fix mdelay badness on shared processor partitions
[POWERPC] disable floating point exceptions for init
[POWERPC] Unify ppc syscall tables
[POWERPC] mpic: add support for serial mode interrupts
[POWERPC] pseries: Print PCI slot location code on failure
[POWERPC] spufs: one more fix for 64k pages
[POWERPC] spufs: fail spu_create with invalid flags
[POWERPC] spufs: clear class2 interrupt status before wakeup
[POWERPC] spufs: fix Makefile for "make clean"
[POWERPC] spufs: remove stop_code from struct spu
[POWERPC] spufs: fix spu irq affinity setting
[POWERPC] spufs: further abstract priv1 register access
[POWERPC] spufs: split the Cell BE support into generic and platform dependant parts
[POWERPC] spufs: dont try to access SPE channel 1 count
[POWERPC] spufs: use kzalloc in create_spu
[POWERPC] spufs: fix initial state of wbox file
...
Manually resolved conflicts in:
drivers/net/phy/Makefile
include/asm-powerpc/spu.h
Diffstat (limited to 'arch/um/sys-ppc')
-rw-r--r-- | arch/um/sys-ppc/misc.S | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/um/sys-ppc/misc.S b/arch/um/sys-ppc/misc.S index 11b7bd768cfd..f0c971db47e4 100644 --- a/arch/um/sys-ppc/misc.S +++ b/arch/um/sys-ppc/misc.S | |||
@@ -23,14 +23,10 @@ | |||
23 | #define CACHE_LINE_SIZE 16 | 23 | #define CACHE_LINE_SIZE 16 |
24 | #define LG_CACHE_LINE_SIZE 4 | 24 | #define LG_CACHE_LINE_SIZE 4 |
25 | #define MAX_COPY_PREFETCH 1 | 25 | #define MAX_COPY_PREFETCH 1 |
26 | #elif !defined(CONFIG_PPC64BRIDGE) | 26 | #else |
27 | #define CACHE_LINE_SIZE 32 | 27 | #define CACHE_LINE_SIZE 32 |
28 | #define LG_CACHE_LINE_SIZE 5 | 28 | #define LG_CACHE_LINE_SIZE 5 |
29 | #define MAX_COPY_PREFETCH 4 | 29 | #define MAX_COPY_PREFETCH 4 |
30 | #else | ||
31 | #define CACHE_LINE_SIZE 128 | ||
32 | #define LG_CACHE_LINE_SIZE 7 | ||
33 | #define MAX_COPY_PREFETCH 1 | ||
34 | #endif /* CONFIG_4xx || CONFIG_8xx */ | 30 | #endif /* CONFIG_4xx || CONFIG_8xx */ |
35 | 31 | ||
36 | .text | 32 | .text |