Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 160819
b: refs/heads/master
c: 05efde9
h: refs/heads/master
i:
  160817: 6e33358
  160815: d8b5542
v: v3
  • Loading branch information
Catalin Marinas committed Jul 24, 2009
1 parent 3ba2bce commit 6bb6a42
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 68b7f7153fa58df710924fbb79722717d2d16094
refs/heads/master: 05efde9d04ccc1d66a9d2225527c6ee638baa385
5 changes: 4 additions & 1 deletion trunk/arch/arm/kernel/head-nommu.S
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,10 @@ ENDPROC(stext)
*/
__after_proc_init:
#ifdef CONFIG_CPU_CP15
mrc p15, 0, r0, c1, c0, 0 @ read control reg
/*
* CP15 system control register value returned in r0 from
* the CPU init function.
*/
#ifdef CONFIG_ALIGNMENT_TRAP
orr r0, r0, #CR_A
#else
Expand Down

0 comments on commit 6bb6a42

Please sign in to comment.