diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-18 18:37:14 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-18 18:37:14 +0100 |
| commit | b2b062b8163391c42b3219d466ca1ac9742b9c7b (patch) | |
| tree | f3f920c09b8de694b1bc1d4b878cfd2b0b98c913 /arch/xtensa/lib/strnlen_user.S | |
| parent | a9de18eb761f7c1c860964b2e5addc1a35c7e861 (diff) | |
| parent | 99937d6455cea95405ac681c86a857d0fcd530bd (diff) | |
Merge branch 'core/percpu' into stackprotector
Conflicts:
arch/x86/include/asm/pda.h
arch/x86/include/asm/system.h
Also, moved include/asm-x86/stackprotector.h to arch/x86/include/asm.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/xtensa/lib/strnlen_user.S')
| -rw-r--r-- | arch/xtensa/lib/strnlen_user.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/lib/strnlen_user.S b/arch/xtensa/lib/strnlen_user.S index ad3f616322c..23f2a89816a 100644 --- a/arch/xtensa/lib/strnlen_user.S +++ b/arch/xtensa/lib/strnlen_user.S @@ -11,7 +11,7 @@ * Copyright (C) 2002 Tensilica Inc. */ -#include <asm/variant/core.h> +#include <variant/core.h> /* Load or store instructions that may cause exceptions use the EX macro. */ |