diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-16 10:09:10 +0100 | 
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-16 10:09:10 +0100 | 
| commit | af2519fb2298cdf7540082c36f4d8c66bbff103f (patch) | |
| tree | 1d290d28d42d42f9e693457762c4008988628060 /arch/sparc/lib/user_fixup.c | |
| parent | 961d7d0ee5150e0197cc81c2a8884ecb230276e2 (diff) | |
| parent | 7cb36b6ccdca03bd87e8faca7fd920643dd1aec7 (diff) | |
Merge branch 'linus' into core/iommu
Conflicts:
	arch/ia64/include/asm/dma-mapping.h
	arch/ia64/include/asm/machvec.h
	arch/ia64/include/asm/machvec_sn2.h
Diffstat (limited to 'arch/sparc/lib/user_fixup.c')
| -rw-r--r-- | arch/sparc/lib/user_fixup.c | 5 | 
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/sparc/lib/user_fixup.c b/arch/sparc/lib/user_fixup.c index 05a361b0a1a4..ac96ae236709 100644 --- a/arch/sparc/lib/user_fixup.c +++ b/arch/sparc/lib/user_fixup.c @@ -7,6 +7,8 @@  #include <linux/kernel.h>  #include <linux/string.h>  #include <linux/errno.h> +#include <linux/module.h> +  #include <asm/uaccess.h>  /* Calculating the exact fault address when using @@ -40,6 +42,7 @@ unsigned long copy_from_user_fixup(void *to, const void __user *from, unsigned l  	return size;  } +EXPORT_SYMBOL(copy_from_user_fixup);  unsigned long copy_to_user_fixup(void __user *to, const void *from, unsigned long size)  { @@ -47,6 +50,7 @@ unsigned long copy_to_user_fixup(void __user *to, const void *from, unsigned lon  	return compute_size((unsigned long) to, size, &offset);  } +EXPORT_SYMBOL(copy_to_user_fixup);  unsigned long copy_in_user_fixup(void __user *to, void __user *from, unsigned long size)  { @@ -64,3 +68,4 @@ unsigned long copy_in_user_fixup(void __user *to, void __user *from, unsigned lo  	return size;  } +EXPORT_SYMBOL(copy_in_user_fixup);  | 
