git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
arch
/
s390
/
include
/
asm
/
lowcore.h
diff --git
a/arch/s390/include/asm/lowcore.h
b/arch/s390/include/asm/lowcore.h
index
5046ad6
..
6bc9426
100644
(file)
--- a/
arch/s390/include/asm/lowcore.h
+++ b/
arch/s390/include/asm/lowcore.h
@@
-132,7
+132,7
@@
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLY__
-#include <asm/cpu
id
.h>
+#include <asm/cpu.h>
#include <asm/ptrace.h>
#include <linux/types.h>
#include <asm/ptrace.h>
#include <linux/types.h>
@@
-275,7
+275,7
@@
struct _lowcore
__u32 user_exec_asce; /* 0x02ac */
/* SMP info area */
__u32 user_exec_asce; /* 0x02ac */
/* SMP info area */
-
cpuid_t cpu_id;
/* 0x02b0 */
+
struct cpuid cpu_id;
/* 0x02b0 */
__u32 cpu_nr; /* 0x02b8 */
__u32 softirq_pending; /* 0x02bc */
__u32 percpu_offset; /* 0x02c0 */
__u32 cpu_nr; /* 0x02b8 */
__u32 softirq_pending; /* 0x02bc */
__u32 percpu_offset; /* 0x02c0 */
@@
-380,7
+380,7
@@
struct _lowcore
__u64 user_exec_asce; /* 0x0318 */
/* SMP info area */
__u64 user_exec_asce; /* 0x0318 */
/* SMP info area */
-
cpuid_t cpu_id;
/* 0x0320 */
+
struct cpuid cpu_id;
/* 0x0320 */
__u32 cpu_nr; /* 0x0328 */
__u32 softirq_pending; /* 0x032c */
__u64 percpu_offset; /* 0x0330 */
__u32 cpu_nr; /* 0x0328 */
__u32 softirq_pending; /* 0x032c */
__u64 percpu_offset; /* 0x0330 */