git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
xtensa
/
lib
/
usercopy.S
diff --git
a/arch/xtensa/lib/usercopy.S
b/arch/xtensa/lib/usercopy.S
index
265db26
..
a8ab1d4
100644
(file)
--- a/
arch/xtensa/lib/usercopy.S
+++ b/
arch/xtensa/lib/usercopy.S
@@
-5,10
+5,10
@@
*
* DO NOT COMBINE this function with <arch/xtensa/lib/hal/memcopy.S>.
* It needs to remain separate and distinct. The hal files are part
*
* DO NOT COMBINE this function with <arch/xtensa/lib/hal/memcopy.S>.
* It needs to remain separate and distinct. The hal files are part
- * of the
the
Xtensa link-time HAL, and those files may differ per
+ * of the Xtensa link-time HAL, and those files may differ per
* processor configuration. Patching the kernel for another
* processor configuration includes replacing the hal files, and we
* processor configuration. Patching the kernel for another
* processor configuration includes replacing the hal files, and we
- * could lo
o
se the special functionality for accessing user-space
+ * could lose the special functionality for accessing user-space
* memory during such a patch. We sacrifice a little code space here
* in favor to simplify code maintenance.
*
* memory during such a patch. We sacrifice a little code space here
* in favor to simplify code maintenance.
*
@@
-53,7
+53,7
@@
* a11/ original length
*/
* a11/ original length
*/
-#include <
xtensa/coreasm
.h>
+#include <
asm/variant/core
.h>
#ifdef __XTENSA_EB__
#define ALIGN(R, W0, W1) src R, W0, W1
#ifdef __XTENSA_EB__
#define ALIGN(R, W0, W1) src R, W0, W1