diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2008-07-28 09:48:29 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2008-07-28 09:48:29 +0000 |
commit | 44c4cd23f1b13f9a544fd4940b4e774e4ec31e04 (patch) | |
tree | 0e01fcb0bfb324a11c102eb049fdc2b2803c189c /target/linux/ar71xx/patches-2.6.26/902-mips_clocksource_init_war.patch | |
parent | 5e942a9011a64a44a125aaa816fd4e7b7383f6af (diff) | |
download | master-31e0f0ae-44c4cd23f1b13f9a544fd4940b4e774e4ec31e04.tar.gz master-31e0f0ae-44c4cd23f1b13f9a544fd4940b4e774e4ec31e04.tar.bz2 master-31e0f0ae-44c4cd23f1b13f9a544fd4940b4e774e4ec31e04.zip |
update to 2.6.26
SVN-Revision: 11968
Diffstat (limited to 'target/linux/ar71xx/patches-2.6.26/902-mips_clocksource_init_war.patch')
-rw-r--r-- | target/linux/ar71xx/patches-2.6.26/902-mips_clocksource_init_war.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/target/linux/ar71xx/patches-2.6.26/902-mips_clocksource_init_war.patch b/target/linux/ar71xx/patches-2.6.26/902-mips_clocksource_init_war.patch new file mode 100644 index 0000000000..7c5125f933 --- /dev/null +++ b/target/linux/ar71xx/patches-2.6.26/902-mips_clocksource_init_war.patch @@ -0,0 +1,45 @@ +--- a/include/asm-mips/hazards.h ++++ b/include/asm-mips/hazards.h +@@ -64,7 +64,7 @@ + _ehb + ) + ASMMACRO(back_to_back_c0_hazard, +- _ehb ++ _ssnop; _ssnop; _ssnop; _ehb + ) + /* + * gcc has a tradition of misscompiling the previous construct using the +--- a/arch/mips/kernel/cevt-r4k.c ++++ b/arch/mips/kernel/cevt-r4k.c +@@ -187,7 +187,7 @@ + */ + if (c0_compare_int_pending()) { + write_c0_compare(read_c0_count()); +- irq_disable_hazard(); ++ back_to_back_c0_hazard(); + if (c0_compare_int_pending()) + return 0; + } +@@ -196,7 +196,7 @@ + cnt = read_c0_count(); + cnt += delta; + write_c0_compare(cnt); +- irq_disable_hazard(); ++ back_to_back_c0_hazard(); + if ((int)(read_c0_count() - cnt) < 0) + break; + /* increase delta if the timer was already expired */ +@@ -205,11 +205,12 @@ + while ((int)(read_c0_count() - cnt) <= 0) + ; /* Wait for expiry */ + ++ back_to_back_c0_hazard(); + if (!c0_compare_int_pending()) + return 0; + + write_c0_compare(read_c0_count()); +- irq_disable_hazard(); ++ back_to_back_c0_hazard(); + if (c0_compare_int_pending()) + return 0; + |