diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-01-13 03:58:37 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-01-13 04:08:50 -0500 |
| commit | 61405fea92c42d072d9b8bd189689f1502a838af (patch) | |
| tree | 013ea3e7ed71f4114004d5852d40b6e89e128f76 /arch/arm/mm/proc-v6.S | |
| parent | 9c443dfdd31eddea6cbe6ee0ca469fbcc4e1dc3b (diff) | |
| parent | 1703f2c321a8a531c393e137a82602e16c6061cb (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge reason: queue up dependent patch, update to -rc4
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mm/proc-v6.S')
| -rw-r--r-- | arch/arm/mm/proc-v6.S | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S index 5485c821101c..395cc90c6613 100644 --- a/arch/arm/mm/proc-v6.S +++ b/arch/arm/mm/proc-v6.S | |||
| @@ -254,10 +254,9 @@ __pj4_v6_proc_info: | |||
| 254 | .long 0x560f5810 | 254 | .long 0x560f5810 |
| 255 | .long 0xff0ffff0 | 255 | .long 0xff0ffff0 |
| 256 | .long PMD_TYPE_SECT | \ | 256 | .long PMD_TYPE_SECT | \ |
| 257 | PMD_SECT_BUFFERABLE | \ | ||
| 258 | PMD_SECT_CACHEABLE | \ | ||
| 259 | PMD_SECT_AP_WRITE | \ | 257 | PMD_SECT_AP_WRITE | \ |
| 260 | PMD_SECT_AP_READ | 258 | PMD_SECT_AP_READ | \ |
| 259 | PMD_FLAGS | ||
| 261 | .long PMD_TYPE_SECT | \ | 260 | .long PMD_TYPE_SECT | \ |
| 262 | PMD_SECT_XN | \ | 261 | PMD_SECT_XN | \ |
| 263 | PMD_SECT_AP_WRITE | \ | 262 | PMD_SECT_AP_WRITE | \ |