diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:27:29 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:27:29 -0400 |
| commit | 5ce001b0e56638c726270d4f9e05d46d4250dfbb (patch) | |
| tree | c21cf007ddef99d5e8b23dde9621bd9152e676a8 /include/asm-alpha/core_mcpcia.h | |
| parent | 7c9f8861e6c9c839f913e49b98c3854daca18f27 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into stackprotector
Diffstat (limited to 'include/asm-alpha/core_mcpcia.h')
| -rw-r--r-- | include/asm-alpha/core_mcpcia.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-alpha/core_mcpcia.h b/include/asm-alpha/core_mcpcia.h index 525b4f6a7ace..acf55b483472 100644 --- a/include/asm-alpha/core_mcpcia.h +++ b/include/asm-alpha/core_mcpcia.h | |||
| @@ -261,7 +261,7 @@ struct el_MCPCIA_uncorrected_frame_mcheck { | |||
| 261 | } | 261 | } |
| 262 | #endif | 262 | #endif |
| 263 | 263 | ||
| 264 | static inline int __mcpcia_is_mmio(unsigned long addr) | 264 | extern inline int __mcpcia_is_mmio(unsigned long addr) |
| 265 | { | 265 | { |
| 266 | return (addr & 0x80000000UL) == 0; | 266 | return (addr & 0x80000000UL) == 0; |
| 267 | } | 267 | } |