diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-06-25 13:06:12 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-06-25 13:10:36 -0400 |
commit | 7b0cfee1a24efdfe0235bac62e53f686fe8a8e24 (patch) | |
tree | eeeb8cc3bf7be5ec0e54b7c4f3808ef88ecca012 /arch/s390/include/asm/setup.h | |
parent | 9756fe38d10b2bf90c81dc4d2f17d5632e135364 (diff) | |
parent | 6b16351acbd415e66ba16bf7d473ece1574cf0bc (diff) |
Merge tag 'v3.5-rc4' into drm-intel-next-queued
I want to merge the "no more fake agp on gen6+" patches into
drm-intel-next (well, the last pieces). But a patch in 3.5-rc4 also
adds a new use of dev->agp. Hence the backmarge to sort this out, for
otherwise drm-intel-next merged into Linus' tree would conflict in the
relevant code, things would compile but nicely OOPS at driver load :(
Conflicts in this merge are just simple cases of "both branches
changed/added lines at the same place". The only tricky part is to
keep the order correct wrt the unwind code in case of errors in
intel_ringbuffer.c (and the MI_DISPLAY_FLIP #defines in i915_reg.h
together, obviously).
Conflicts:
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_ringbuffer.c
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'arch/s390/include/asm/setup.h')
-rw-r--r-- | arch/s390/include/asm/setup.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h index 7244e1f64126..40eb2ff88e9e 100644 --- a/arch/s390/include/asm/setup.h +++ b/arch/s390/include/asm/setup.h | |||
@@ -22,19 +22,19 @@ | |||
22 | #include <asm/lowcore.h> | 22 | #include <asm/lowcore.h> |
23 | #include <asm/types.h> | 23 | #include <asm/types.h> |
24 | 24 | ||
25 | #ifndef __s390x__ | 25 | #ifndef CONFIG_64BIT |
26 | #define IPL_DEVICE (*(unsigned long *) (0x10404)) | 26 | #define IPL_DEVICE (*(unsigned long *) (0x10404)) |
27 | #define INITRD_START (*(unsigned long *) (0x1040C)) | 27 | #define INITRD_START (*(unsigned long *) (0x1040C)) |
28 | #define INITRD_SIZE (*(unsigned long *) (0x10414)) | 28 | #define INITRD_SIZE (*(unsigned long *) (0x10414)) |
29 | #define OLDMEM_BASE (*(unsigned long *) (0x1041C)) | 29 | #define OLDMEM_BASE (*(unsigned long *) (0x1041C)) |
30 | #define OLDMEM_SIZE (*(unsigned long *) (0x10424)) | 30 | #define OLDMEM_SIZE (*(unsigned long *) (0x10424)) |
31 | #else /* __s390x__ */ | 31 | #else /* CONFIG_64BIT */ |
32 | #define IPL_DEVICE (*(unsigned long *) (0x10400)) | 32 | #define IPL_DEVICE (*(unsigned long *) (0x10400)) |
33 | #define INITRD_START (*(unsigned long *) (0x10408)) | 33 | #define INITRD_START (*(unsigned long *) (0x10408)) |
34 | #define INITRD_SIZE (*(unsigned long *) (0x10410)) | 34 | #define INITRD_SIZE (*(unsigned long *) (0x10410)) |
35 | #define OLDMEM_BASE (*(unsigned long *) (0x10418)) | 35 | #define OLDMEM_BASE (*(unsigned long *) (0x10418)) |
36 | #define OLDMEM_SIZE (*(unsigned long *) (0x10420)) | 36 | #define OLDMEM_SIZE (*(unsigned long *) (0x10420)) |
37 | #endif /* __s390x__ */ | 37 | #endif /* CONFIG_64BIT */ |
38 | #define COMMAND_LINE ((char *) (0x10480)) | 38 | #define COMMAND_LINE ((char *) (0x10480)) |
39 | 39 | ||
40 | #define CHUNK_READ_WRITE 0 | 40 | #define CHUNK_READ_WRITE 0 |
@@ -89,7 +89,7 @@ extern unsigned int user_mode; | |||
89 | 89 | ||
90 | #define MACHINE_HAS_DIAG9C (S390_lowcore.machine_flags & MACHINE_FLAG_DIAG9C) | 90 | #define MACHINE_HAS_DIAG9C (S390_lowcore.machine_flags & MACHINE_FLAG_DIAG9C) |
91 | 91 | ||
92 | #ifndef __s390x__ | 92 | #ifndef CONFIG_64BIT |
93 | #define MACHINE_HAS_IEEE (S390_lowcore.machine_flags & MACHINE_FLAG_IEEE) | 93 | #define MACHINE_HAS_IEEE (S390_lowcore.machine_flags & MACHINE_FLAG_IEEE) |
94 | #define MACHINE_HAS_CSP (S390_lowcore.machine_flags & MACHINE_FLAG_CSP) | 94 | #define MACHINE_HAS_CSP (S390_lowcore.machine_flags & MACHINE_FLAG_CSP) |
95 | #define MACHINE_HAS_IDTE (0) | 95 | #define MACHINE_HAS_IDTE (0) |
@@ -100,7 +100,7 @@ extern unsigned int user_mode; | |||
100 | #define MACHINE_HAS_PFMF (0) | 100 | #define MACHINE_HAS_PFMF (0) |
101 | #define MACHINE_HAS_SPP (0) | 101 | #define MACHINE_HAS_SPP (0) |
102 | #define MACHINE_HAS_TOPOLOGY (0) | 102 | #define MACHINE_HAS_TOPOLOGY (0) |
103 | #else /* __s390x__ */ | 103 | #else /* CONFIG_64BIT */ |
104 | #define MACHINE_HAS_IEEE (1) | 104 | #define MACHINE_HAS_IEEE (1) |
105 | #define MACHINE_HAS_CSP (1) | 105 | #define MACHINE_HAS_CSP (1) |
106 | #define MACHINE_HAS_IDTE (S390_lowcore.machine_flags & MACHINE_FLAG_IDTE) | 106 | #define MACHINE_HAS_IDTE (S390_lowcore.machine_flags & MACHINE_FLAG_IDTE) |
@@ -111,7 +111,7 @@ extern unsigned int user_mode; | |||
111 | #define MACHINE_HAS_PFMF (S390_lowcore.machine_flags & MACHINE_FLAG_PFMF) | 111 | #define MACHINE_HAS_PFMF (S390_lowcore.machine_flags & MACHINE_FLAG_PFMF) |
112 | #define MACHINE_HAS_SPP (S390_lowcore.machine_flags & MACHINE_FLAG_SPP) | 112 | #define MACHINE_HAS_SPP (S390_lowcore.machine_flags & MACHINE_FLAG_SPP) |
113 | #define MACHINE_HAS_TOPOLOGY (S390_lowcore.machine_flags & MACHINE_FLAG_TOPOLOGY) | 113 | #define MACHINE_HAS_TOPOLOGY (S390_lowcore.machine_flags & MACHINE_FLAG_TOPOLOGY) |
114 | #endif /* __s390x__ */ | 114 | #endif /* CONFIG_64BIT */ |
115 | 115 | ||
116 | #define ZFCPDUMP_HSA_SIZE (32UL<<20) | 116 | #define ZFCPDUMP_HSA_SIZE (32UL<<20) |
117 | #define ZFCPDUMP_HSA_SIZE_MAX (64UL<<20) | 117 | #define ZFCPDUMP_HSA_SIZE_MAX (64UL<<20) |
@@ -153,19 +153,19 @@ extern void (*_machine_power_off)(void); | |||
153 | 153 | ||
154 | #else /* __ASSEMBLY__ */ | 154 | #else /* __ASSEMBLY__ */ |
155 | 155 | ||
156 | #ifndef __s390x__ | 156 | #ifndef CONFIG_64BIT |
157 | #define IPL_DEVICE 0x10404 | 157 | #define IPL_DEVICE 0x10404 |
158 | #define INITRD_START 0x1040C | 158 | #define INITRD_START 0x1040C |
159 | #define INITRD_SIZE 0x10414 | 159 | #define INITRD_SIZE 0x10414 |
160 | #define OLDMEM_BASE 0x1041C | 160 | #define OLDMEM_BASE 0x1041C |
161 | #define OLDMEM_SIZE 0x10424 | 161 | #define OLDMEM_SIZE 0x10424 |
162 | #else /* __s390x__ */ | 162 | #else /* CONFIG_64BIT */ |
163 | #define IPL_DEVICE 0x10400 | 163 | #define IPL_DEVICE 0x10400 |
164 | #define INITRD_START 0x10408 | 164 | #define INITRD_START 0x10408 |
165 | #define INITRD_SIZE 0x10410 | 165 | #define INITRD_SIZE 0x10410 |
166 | #define OLDMEM_BASE 0x10418 | 166 | #define OLDMEM_BASE 0x10418 |
167 | #define OLDMEM_SIZE 0x10420 | 167 | #define OLDMEM_SIZE 0x10420 |
168 | #endif /* __s390x__ */ | 168 | #endif /* CONFIG_64BIT */ |
169 | #define COMMAND_LINE 0x10480 | 169 | #define COMMAND_LINE 0x10480 |
170 | 170 | ||
171 | #endif /* __ASSEMBLY__ */ | 171 | #endif /* __ASSEMBLY__ */ |