Commit 3694fbeb authored by David S. Miller's avatar David S. Miller

[SPARC]: Always use linux/thread_info.h now for C code.

parent 5e2027e2
...@@ -16,12 +16,7 @@ ...@@ -16,12 +16,7 @@
* We might want to consider doing the same to shave a few cycles. * We might want to consider doing the same to shave a few cycles.
*/ */
// Applications do not include kernel headers anymore, period. #include <linux/thread_info.h>
// #ifdef __KERNEL__
#ifndef _ASM_THREAD_INFO_H
#include <asm/thread_info.h>
#endif
struct task_struct; struct task_struct;
...@@ -33,6 +28,4 @@ static inline struct task_struct *__get_current(void) ...@@ -33,6 +28,4 @@ static inline struct task_struct *__get_current(void)
} }
#define current __get_current() #define current __get_current()
// #endif /* __KERNEL__ */
#endif /* !(_ASM_CURRENT_H) */ #endif /* !(_ASM_CURRENT_H) */
...@@ -8,7 +8,10 @@ ...@@ -8,7 +8,10 @@
#define _SPARC_PGTSRMMU_H #define _SPARC_PGTSRMMU_H
#include <asm/page.h> #include <asm/page.h>
#ifdef __ASSEMBLY__
#include <asm/thread_info.h> /* TI_UWINMASK for WINDOW_FLUSH */ #include <asm/thread_info.h> /* TI_UWINMASK for WINDOW_FLUSH */
#endif
/* PMD_SHIFT determines the size of the area a second-level page table entry can map */ /* PMD_SHIFT determines the size of the area a second-level page table entry can map */
#define SRMMU_PMD_SHIFT 18 #define SRMMU_PMD_SHIFT 18
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
#include <linux/config.h> #include <linux/config.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/threads.h> /* NR_CPUS */ #include <linux/threads.h> /* NR_CPUS */
#include <linux/thread_info.h>
#include <asm/segment.h> #include <asm/segment.h>
#include <asm/thread_info.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/openprom.h> /* romvec. XXX will be dealt later. Promise. */ #include <asm/openprom.h> /* romvec. XXX will be dealt later. Promise. */
#include <asm/psr.h> #include <asm/psr.h>
......
#ifndef _SPARC64_CURRENT_H #ifndef _SPARC64_CURRENT_H
#define _SPARC64_CURRENT_H #define _SPARC64_CURRENT_H
#include <asm/thread_info.h> #include <linux/thread_info.h>
register struct task_struct *current asm("g4"); register struct task_struct *current asm("g4");
......
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
#define __SPARC64_SYSTEM_H #define __SPARC64_SYSTEM_H
#include <linux/config.h> #include <linux/config.h>
#include <linux/thread_info.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/visasm.h> #include <asm/visasm.h>
#include <asm/thread_info.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/* /*
......
...@@ -3,9 +3,12 @@ ...@@ -3,9 +3,12 @@
#define _SPARC64_TTABLE_H #define _SPARC64_TTABLE_H
#include <linux/config.h> #include <linux/config.h>
#include <asm/thread_info.h>
#include <asm/utrap.h> #include <asm/utrap.h>
#ifdef __ASSEMBLY__
#include <asm/thread_info.h>
#endif
#define BOOT_KERNEL b sparc64_boot; nop; nop; nop; nop; nop; nop; nop; #define BOOT_KERNEL b sparc64_boot; nop; nop; nop; nop; nop; nop; nop;
/* We need a "cleaned" instruction... */ /* We need a "cleaned" instruction... */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment