diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-14 14:02:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-14 14:02:04 -0700 |
| commit | 6455c66a8750170c2b4a41c6f6c53310a49e08ce (patch) | |
| tree | 42730921102f92a9b7f0d83068c7f90ffb10d22e /arch/arm/vfp/vfpmodule.c | |
| parent | 7eeac505d912cfe5805290f8f9e293b134e00237 (diff) | |
| parent | b9338a78fc21e980d33c58b31f3bb37cd48a68f6 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 4567/1: Fix 'Oops - undefined instruction' when CONFIG_VFP=y on non VFP device
[ARM] realview: disable second GIC on RevB MPCore platforms
Diffstat (limited to 'arch/arm/vfp/vfpmodule.c')
| -rw-r--r-- | arch/arm/vfp/vfpmodule.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c index 04ddab2bd87..eea3f50743d 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c @@ -323,6 +323,7 @@ static int __init vfp_init(void) * we just need to read the VFPSID register. */ vfp_vector = vfp_testing_entry; + barrier(); vfpsid = fmrx(FPSID); barrier(); vfp_vector = vfp_null_entry; |