Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Fix __{in,out}s{w,l} to handle unaligned data [IA64] Fix ia64 build failure when CONFIG_SFC=m
This commit is contained in:
commit
1ef708ea44
|
@ -19,6 +19,8 @@
|
|||
* Copyright (C) 1999 Don Dugger <don.dugger@intel.com>
|
||||
*/
|
||||
|
||||
#include <asm/unaligned.h>
|
||||
|
||||
/* We don't use IO slowdowns on the ia64, but.. */
|
||||
#define __SLOW_DOWN_IO do { } while (0)
|
||||
#define SLOW_DOWN_IO do { } while (0)
|
||||
|
@ -241,7 +243,7 @@ __insw (unsigned long port, void *dst, unsigned long count)
|
|||
unsigned short *dp = dst;
|
||||
|
||||
while (count--)
|
||||
*dp++ = platform_inw(port);
|
||||
put_unaligned(platform_inw(port), dp++);
|
||||
}
|
||||
|
||||
static inline void
|
||||
|
@ -250,7 +252,7 @@ __insl (unsigned long port, void *dst, unsigned long count)
|
|||
unsigned int *dp = dst;
|
||||
|
||||
while (count--)
|
||||
*dp++ = platform_inl(port);
|
||||
put_unaligned(platform_inl(port), dp++);
|
||||
}
|
||||
|
||||
static inline void
|
||||
|
@ -268,7 +270,7 @@ __outsw (unsigned long port, const void *src, unsigned long count)
|
|||
const unsigned short *sp = src;
|
||||
|
||||
while (count--)
|
||||
platform_outw(*sp++, port);
|
||||
platform_outw(get_unaligned(sp++), port);
|
||||
}
|
||||
|
||||
static inline void
|
||||
|
@ -277,7 +279,7 @@ __outsl (unsigned long port, const void *src, unsigned long count)
|
|||
const unsigned int *sp = src;
|
||||
|
||||
while (count--)
|
||||
platform_outl(*sp++, port);
|
||||
platform_outl(get_unaligned(sp++), port);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -138,6 +138,7 @@ cpumask_t cpu_possible_map = CPU_MASK_NONE;
|
|||
EXPORT_SYMBOL(cpu_possible_map);
|
||||
|
||||
cpumask_t cpu_core_map[NR_CPUS] __cacheline_aligned;
|
||||
EXPORT_SYMBOL(cpu_core_map);
|
||||
DEFINE_PER_CPU_SHARED_ALIGNED(cpumask_t, cpu_sibling_map);
|
||||
EXPORT_PER_CPU_SYMBOL(cpu_sibling_map);
|
||||
|
||||
|
|
Loading…
Reference in a new issue