Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] ppc: More compile fixes [POWERPC] ppc: Don't run prom_init_check for arch/ppc builds [POWERPC] ppc: Include <asm/cacheflush.h> in kernel/ppc_ksyms.c [POWERPC] ppc: Use ebony_defconfig for defconfig [POWERPC] Fix default cputable entries for e200 and e500 families
This commit is contained in:
@@ -178,7 +178,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
|
||||
|
||||
}
|
||||
|
||||
extern inline void * xchg_ptr(void * m, void * val)
|
||||
static inline void * xchg_ptr(void * m, void * val)
|
||||
{
|
||||
return (void *) xchg_u32(m, (unsigned long) val);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user