From 75aeecfa5a687c93454f6422f7592e8f173734e7 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Fri, 3 Oct 2003 04:32:32 +1000 Subject: [PATCH] ppc64: merge some changes from the ameslab tree --- arch/ppc64/kernel/pci_dma.c | 8 ++++---- include/asm-ppc64/cputable.h | 2 +- include/asm-ppc64/memory.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/ppc64/kernel/pci_dma.c b/arch/ppc64/kernel/pci_dma.c index 92ea66bf55541..a25ade4f14738 100644 --- a/arch/ppc64/kernel/pci_dma.c +++ b/arch/ppc64/kernel/pci_dma.c @@ -98,7 +98,7 @@ void free_tce_range_nolock(struct TceTable *, unsigned order ); /* allocates a range of tces and sets them to the pages */ -static inline dma_addr_t get_tces( struct TceTable *, +inline dma_addr_t get_tces( struct TceTable *, unsigned order, void *page, unsigned numPages, @@ -210,7 +210,7 @@ static void tce_build_pSeries(struct TceTable *tbl, long tcenum, * Build a TceTable structure. This contains a multi-level bit map which * is used to manage allocation of the tce space. */ -static struct TceTable *build_tce_table( struct TceTable * tbl ) +struct TceTable *build_tce_table( struct TceTable * tbl ) { unsigned long bits, bytes, totalBytes; unsigned long numBits[NUM_TCE_LEVELS], numBytes[NUM_TCE_LEVELS]; @@ -518,7 +518,7 @@ static long test_tce_range( struct TceTable *tbl, long tcenum, unsigned order ) return retval; } -static inline dma_addr_t get_tces( struct TceTable *tbl, unsigned order, void *page, unsigned numPages, int direction ) +inline dma_addr_t get_tces( struct TceTable *tbl, unsigned order, void *page, unsigned numPages, int direction ) { long tcenum; unsigned long uaddr; @@ -581,7 +581,7 @@ static void tce_free_one_pSeries( struct TceTable *tbl, long tcenum ) } #endif -static void tce_free(struct TceTable *tbl, dma_addr_t dma_addr, +void tce_free(struct TceTable *tbl, dma_addr_t dma_addr, unsigned order, unsigned num_pages) { long tcenum, total_tces, free_tce; diff --git a/include/asm-ppc64/cputable.h b/include/asm-ppc64/cputable.h index 36b7a9b819c16..c885ff50bc86e 100644 --- a/include/asm-ppc64/cputable.h +++ b/include/asm-ppc64/cputable.h @@ -30,7 +30,7 @@ #ifndef __ASSEMBLY__ /* This structure can grow, it's real size is used by head.S code - * via the mkdefs mecanism. + * via the mkdefs mechanism. */ struct cpu_spec; diff --git a/include/asm-ppc64/memory.h b/include/asm-ppc64/memory.h index 78297eff50155..82824fe447a0d 100644 --- a/include/asm-ppc64/memory.h +++ b/include/asm-ppc64/memory.h @@ -58,7 +58,7 @@ static inline void isync(void) #define HMT_LOW #define HMT_MEDIUM -#define HMT_LOW +#define HMT_HIGH #endif #endif -- 2.53.0