Commit 8dd9d072 authored by David S. Miller's avatar David S. Miller

Merge nuts.ninka.net:/disk1/davem/BK/sparcwork-2.5

into nuts.ninka.net:/disk1/davem/BK/sparc-2.5
parents 606e1044 21046a9f
...@@ -720,9 +720,10 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu) ...@@ -720,9 +720,10 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
void flush_dcache_page_all(struct mm_struct *mm, struct page *page) void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
{ {
cpumask_t mask = cpu_online_map; cpumask_t mask = cpu_online_map;
cpu_clear(smp_processor_id(), mask);
u64 data0; u64 data0;
cpu_clear(smp_processor_id(), mask);
#ifdef CONFIG_DEBUG_DCFLUSH #ifdef CONFIG_DEBUG_DCFLUSH
atomic_inc(&dcpage_flushes); atomic_inc(&dcpage_flushes);
#endif #endif
......
...@@ -68,7 +68,6 @@ extern void die_if_kernel(char *str, struct pt_regs *regs); ...@@ -68,7 +68,6 @@ extern void die_if_kernel(char *str, struct pt_regs *regs);
extern pid_t kernel_thread(int (*fn)(void *), void * arg, unsigned long flags); extern pid_t kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
void _sigpause_common (unsigned int set, struct pt_regs *); void _sigpause_common (unsigned int set, struct pt_regs *);
extern void *__bzero(void *, size_t); extern void *__bzero(void *, size_t);
extern void *__bzero_noasi(void *, size_t);
extern void *__memscan_zero(void *, size_t); extern void *__memscan_zero(void *, size_t);
extern void *__memscan_generic(void *, int, size_t); extern void *__memscan_generic(void *, int, size_t);
extern int __memcmp(const void *, const void *, __kernel_size_t); extern int __memcmp(const void *, const void *, __kernel_size_t);
......
...@@ -263,9 +263,10 @@ extern unsigned long __copy_in_user(void __user *to, const void __user *from, ...@@ -263,9 +263,10 @@ extern unsigned long __copy_in_user(void __user *to, const void __user *from,
#define copy_to_user __copy_to_user #define copy_to_user __copy_to_user
#define copy_in_user __copy_in_user #define copy_in_user __copy_in_user
extern unsigned long __bzero_noasi(void *, unsigned long);
static inline unsigned long __clear_user(void __user *addr, unsigned long size) static inline unsigned long __clear_user(void __user *addr, unsigned long size)
{ {
extern unsigned long __bzero_noasi(void *addr, unsigned long size);
return __bzero_noasi((void *) addr, size); return __bzero_noasi((void *) addr, size);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment