diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-10 01:27:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-10 01:27:33 -0400 |
| commit | e548833df83c3554229eff0672900bfe958b45fd (patch) | |
| tree | 85efc4a76dc356593d6d394776aeb845dc580fb6 /arch/powerpc/kernel/head_44x.S | |
| parent | cbd9da7be869f676afc204e1a664163778c770bd (diff) | |
| parent | 053d8f6622701f849fda2ca2c9ae596c13599ba9 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/main.c
Diffstat (limited to 'arch/powerpc/kernel/head_44x.S')
| -rw-r--r-- | arch/powerpc/kernel/head_44x.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/head_44x.S b/arch/powerpc/kernel/head_44x.S index 5ab484ef06a..562305b40a8 100644 --- a/arch/powerpc/kernel/head_44x.S +++ b/arch/powerpc/kernel/head_44x.S | |||
| @@ -113,6 +113,10 @@ _ENTRY(_start); | |||
| 113 | stw r5, 0(r4) /* Save abatron_pteptrs at a fixed location */ | 113 | stw r5, 0(r4) /* Save abatron_pteptrs at a fixed location */ |
| 114 | stw r6, 0(r5) | 114 | stw r6, 0(r5) |
| 115 | 115 | ||
| 116 | /* Clear the Machine Check Syndrome Register */ | ||
| 117 | li r0,0 | ||
| 118 | mtspr SPRN_MCSR,r0 | ||
| 119 | |||
| 116 | /* Let's move on */ | 120 | /* Let's move on */ |
| 117 | lis r4,start_kernel@h | 121 | lis r4,start_kernel@h |
| 118 | ori r4,r4,start_kernel@l | 122 | ori r4,r4,start_kernel@l |