diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-18 10:08:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-18 10:08:47 -0800 |
| commit | 9a8a5702c5a7298c0edd125464aa178dd8b50440 (patch) | |
| tree | 9d8aab6f2670e23f8517f44c5a79c3127e2eb5c2 | |
| parent | 7b077868cb8bc31aa5a0dad961ecc9f157bff744 (diff) | |
| parent | 634bd40a894d64df09ba36c12bb6e70787989ba9 (diff) | |
Merge tag 'for-3.8' of git://openrisc.net/~jonas/linux
Pull OpenRISC update from Jonas Bonn:
"Trivial cleanups for OpenRISC."
* tag 'for-3.8' of git://openrisc.net/~jonas/linux:
openrisc: use kbuild.h instead of defining macros in asm-offset.c
openrisc: Use Kbuild infrastructure for kvm_para.h
| -rw-r--r-- | arch/openrisc/include/asm/Kbuild | 1 | ||||
| -rw-r--r-- | arch/openrisc/include/uapi/asm/kvm_para.h | 1 | ||||
| -rw-r--r-- | arch/openrisc/kernel/asm-offsets.c | 6 |
3 files changed, 2 insertions, 6 deletions
diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index 8971026e1c6..f20d01d9aaf 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -32,6 +32,7 @@ generic-y += ipcbuf.h generic-y += irq_regs.h generic-y += kdebug.h generic-y += kmap_types.h +generic-y += kvm_para.h generic-y += local.h generic-y += mman.h generic-y += module.h diff --git a/arch/openrisc/include/uapi/asm/kvm_para.h b/arch/openrisc/include/uapi/asm/kvm_para.h deleted file mode 100644 index 14fab8f0b95..00000000000 --- a/arch/openrisc/include/uapi/asm/kvm_para.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/kvm_para.h> diff --git a/arch/openrisc/kernel/asm-offsets.c b/arch/openrisc/kernel/asm-offsets.c index 1a242a0d758..ddb73685586 100644 --- a/arch/openrisc/kernel/asm-offsets.c +++ b/arch/openrisc/kernel/asm-offsets.c @@ -34,15 +34,11 @@ #include <linux/mm.h> #include <linux/io.h> #include <linux/thread_info.h> +#include <linux/kbuild.h> #include <asm/page.h> #include <asm/pgtable.h> #include <asm/processor.h> -#define DEFINE(sym, val) \ - asm volatile("\n->" #sym " %0 " #val : : "i" (val)) - -#define BLANK() asm volatile("\n->" : : ) - int main(void) { /* offsets into the task_struct */ |