diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-10 14:55:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-10 14:55:16 -0700 |
| commit | 8d7551eb1916832f2a5b27346edf24e7b2382f67 (patch) | |
| tree | a9151f92b1586e024a839e71aa2c58d7f44cee41 /arch/cris/include/asm/processor.h | |
| parent | 3da06ed7366f6749ac333d1c051131c1a550755f (diff) | |
| parent | be8cb7f42ab9a8723082daa83ac28a11d4dde942 (diff) | |
| download | linux-8d7551eb1916832f2a5b27346edf24e7b2382f67.tar.bz2 | |
Merge tag 'cris-for-3.12' of git://jni.nu/cris
Pull CRIS updates from Jesper Nilsson:
"Mostly cleanup and removal of unused configs"
* tag 'cris-for-3.12' of git://jni.nu/cris:
CRIS: drop unused Kconfig symbols
CRIS: Add kvm_para.h which includes generic file
CRIS: remove unused current_regs
CRIS: Remove last traces of legacy RTC drivers
CRIS: remove "config OOM_REBOOT"
Diffstat (limited to 'arch/cris/include/asm/processor.h')
| -rw-r--r-- | arch/cris/include/asm/processor.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/cris/include/asm/processor.h b/arch/cris/include/asm/processor.h index c0a29b96b92b..15b815df29c1 100644 --- a/arch/cris/include/asm/processor.h +++ b/arch/cris/include/asm/processor.h @@ -47,7 +47,6 @@ struct task_struct; */ #define task_pt_regs(task) user_regs(task_thread_info(task)) -#define current_regs() task_pt_regs(current) unsigned long get_wchan(struct task_struct *p); |