Merge branch 'kernel2.6.32.8' into next

Conflicts:
	doc/packages-list.txt
	lfs/linux

diff --git a/config/rootfiles/oldcore/37/filelists/files b/config/rootfiles/oldcore/37/filelists/files
index 1e46cb98f779504d0865b7c2c077e1dbd7567b7c..402651770afe979a9fd0166c6dce461e87b8ba96 100644 (file)
--- a/config/rootfiles/oldcore/37/filelists/files
+++ b/config/rootfiles/oldcore/37/filelists/files
@@ -7,4 +7,7 @@ lib/modules/2.6.27.42-ipfire/kernel/drivers/hwmon/coretemp.ko
 lib/modules/2.6.27.42-ipfire-xen/kernel/drivers/hwmon/coretemp.ko
 lib/modules/2.6.27.42-ipfire/kernel/drivers/net/et131x.ko
 lib/modules/2.6.27.42-ipfire-xen/kernel/drivers/net/et131x.ko
+lib/modules/2.6.27.42-ipfire/kernel/arch/x86/kernel/cpu/cpufreq/p4-clockmod.ko
+lib/modules/2.6.27.42-ipfire-xen/kernel/arch/x86/kernel/cpu/cpufreq/p4-clockmod.ko
 srv/web/ipfire/cgi-bin/urlfilter.cgi
+srv/web/ipfire/cgi-bin/outgoingfw.cgi
\ No newline at end of file

diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi
index f112f6efc24e2112570b240c6ad3417b8fbf242b..c5db16bab27d375dbad00968ced07dbf2fe7bd94 100644 (file)
--- a/html/cgi-bin/outgoingfw.cgi
+++ b/html/cgi-bin/outgoingfw.cgi
@@ -667,7 +667,7 @@ END
                        <td width='30%' align='left'><select name='LOG'>
                                                                                <option value='$Lang::tr{'active'}' $selected{'LOG'}{$Lang::tr{'active'}}>$Lang::tr{'active'}</option>
                                                                                <option value='$Lang::tr{'inactive'}' $selected{'LOG'}{$Lang::tr{'inactive'}}>$Lang::tr{'inactive'}</option>
-                                                                               </select></td>";
+                                                                               </select></td>
                    <td width='20%' align='right' colspan='2' />
                    <td width='30%' align='left' colspan='2' />
                <tr><td width='20%' align='right'>$Lang::tr{'destination ip'}: <img src='/blob.gif' />

diff --git a/src/patches/linux-2.6.27-atom-clockmod.patch b/src/patches/linux-2.6.27-atom-clockmod.patch
new file mode 100644 (file)
index 0000000..ef59fef
--- /dev/null
+++ b/src/patches/linux-2.6.27-atom-clockmod.patch
@@ -0,0 +1,12 @@
+diff -Naur linux-2.6.27.45.org/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c linux-2.6.27.45/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
+--- linux-2.6.27.45.org/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c      2010-01-29 00:21:45.000000000 +0100
++++ linux-2.6.27.45/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c  2010-02-11 15:21:39.000000000 +0100
+@@ -160,6 +160,8 @@
+               switch (c->x86_model) {
+               case 0x0E: /* Core */
+               case 0x0F: /* Core Duo */
++              case 0x16: /* Celeron Core */
++              case 0x1c: /* Atom */
+                       p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
+                       return speedstep_get_processor_frequency(SPEEDSTEP_PROCESSOR_PCORE);
+               case 0x0D: /* Pentium M (Dothan) */