diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:31:35 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:32:03 -0500 |
| commit | 4ec3eb13634529c0bc7466658d84d0bbe3244aea (patch) | |
| tree | b491daac2ccfc7b8ca88e171a43f66888463568a /arch/tile/include/asm/processor.h | |
| parent | 24056f525051a9e186af28904b396320e18bf9a0 (diff) | |
| parent | 15095bb0fe779c0403091bda7adce5fb3bb9ca35 (diff) | |
Merge branch 'smp' into misc
Conflicts:
arch/arm/kernel/entry-armv.S
arch/arm/mm/ioremap.c
Diffstat (limited to 'arch/tile/include/asm/processor.h')
| -rw-r--r-- | arch/tile/include/asm/processor.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/tile/include/asm/processor.h b/arch/tile/include/asm/processor.h index 1747ff3946b2..a9e7c8760334 100644 --- a/arch/tile/include/asm/processor.h +++ b/arch/tile/include/asm/processor.h | |||
| @@ -292,8 +292,18 @@ extern int kstack_hash; | |||
| 292 | /* Are we using huge pages in the TLB for kernel data? */ | 292 | /* Are we using huge pages in the TLB for kernel data? */ |
| 293 | extern int kdata_huge; | 293 | extern int kdata_huge; |
| 294 | 294 | ||
| 295 | /* Support standard Linux prefetching. */ | ||
| 296 | #define ARCH_HAS_PREFETCH | ||
| 297 | #define prefetch(x) __builtin_prefetch(x) | ||
| 295 | #define PREFETCH_STRIDE CHIP_L2_LINE_SIZE() | 298 | #define PREFETCH_STRIDE CHIP_L2_LINE_SIZE() |
| 296 | 299 | ||
| 300 | /* Bring a value into the L1D, faulting the TLB if necessary. */ | ||
| 301 | #ifdef __tilegx__ | ||
| 302 | #define prefetch_L1(x) __insn_prefetch_l1_fault((void *)(x)) | ||
| 303 | #else | ||
| 304 | #define prefetch_L1(x) __insn_prefetch_L1((void *)(x)) | ||
| 305 | #endif | ||
| 306 | |||
| 297 | #else /* __ASSEMBLY__ */ | 307 | #else /* __ASSEMBLY__ */ |
| 298 | 308 | ||
| 299 | /* Do some slow action (e.g. read a slow SPR). */ | 309 | /* Do some slow action (e.g. read a slow SPR). */ |