Commit 9a8a5702 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 7b077868 634bd40a

arch/openrisc/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/openrisc/include/uapi/asm/kvm_para.h

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
#include <asm-generic/kvm_para.h>

arch/openrisc/kernel/asm-offsets.c

+1 −5
Original line number Diff line number Diff line
@@ -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 */