Merge lp:~rsalveti/jasper-initramfs/746137 into lp:jasper-initramfs

[Ricardo Salveti]

[Oliver Grawert (ogra)]

merged

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-07 17:34:57 +0000
+++ debian/changelog	2011-04-11 03:39:27 +0000
@@ -1,3 +1,10 @@
+jasper-initramfs (0.54) UNRELEASED; urgency=low
+
+  * Workaround to increase kernel min_free_kbytes to avoid page allocation
+    failures (LP: #746137)
+
+ -- Ricardo Salveti de Araujo <[e-mail]>  Mon, 11 Apr 2011 00:31:33 -0300
+
 jasper-initramfs (0.53) natty; urgency=low
 
   * fix typo
 
=== modified file 'scripts/local-bottom/jasper_setup'
--- scripts/local-bottom/jasper_setup	2011-04-07 17:34:31 +0000
+++ scripts/local-bottom/jasper_setup	2011-04-11 03:39:27 +0000
@@ -177,6 +177,9 @@
 	cp /root/usr/share/jasper-initramfs/sysctl/30-jasper-root-on-sd.conf /root/etc/sysctl.d/ >>$LOGFILE 2>&1
 fi
 
+# for bug 746137
+cp /root/usr/share/jasper-initramfs/sysctl/30-jasper-smsc-min-free-kbytes.conf /root/etc/sysctl.d/ >>$LOGFILE 2>&1
+
 chroot /root /usr/share/jasper-initramfs/apt/enable_additional_repos.py >>$LOGFILE 2>&1
 
 # move jasper.log to root filesystem
 
=== added file 'sysctl/30-jasper-smsc-min-free-kbytes.conf'
--- sysctl/30-jasper-smsc-min-free-kbytes.conf	1970-01-01 00:00:00 +0000
+++ sysctl/30-jasper-smsc-min-free-kbytes.conf	2011-04-11 03:39:27 +0000
@@ -0,0 +1,12 @@
+# The driver smsc95xx, used by both Beagleboard XM and Pandaboard uses
+# turbo mode by default, that enables multiple frames per Rx transaction,
+# increasing performance but consuming more kernel memory.
+# To avoid page allocation failures and smsc kevent drops we need to
+# increase the minimum free system memory in the kernel to a higher value.
+# If you're still having page allocation failures, try to increase this
+# value to 12288 or even higher. You could also disable the driver's turbo
+# mode, but decreasing the ethernet performance.
+# If you encounter problems due to the settings please file a bug
+# against the jasper-initramfs ubuntu package.
+# For more details please check http://bugs.launchpad.net/bugs/746137
+vm.min_free_kbytes = 8192