|
@@ -81,6 +81,8 @@
|
|
#include <asm/uaccess.h>
|
|
#include <asm/uaccess.h>
|
|
#include <asm/ioctls.h>
|
|
#include <asm/ioctls.h>
|
|
#include <linux/bootmem.h>
|
|
#include <linux/bootmem.h>
|
|
|
|
+#include <linux/highmem.h>
|
|
|
|
+#include <linux/swap.h>
|
|
#include <linux/types.h>
|
|
#include <linux/types.h>
|
|
#include <linux/fcntl.h>
|
|
#include <linux/fcntl.h>
|
|
#include <linux/module.h>
|
|
#include <linux/module.h>
|
|
@@ -1751,15 +1753,16 @@ void __init udp_table_init(struct udp_table *table)
|
|
|
|
|
|
void __init udp_init(void)
|
|
void __init udp_init(void)
|
|
{
|
|
{
|
|
- unsigned long limit;
|
|
|
|
|
|
+ unsigned long nr_pages, limit;
|
|
|
|
|
|
udp_table_init(&udp_table);
|
|
udp_table_init(&udp_table);
|
|
/* Set the pressure threshold up by the same strategy of TCP. It is a
|
|
/* Set the pressure threshold up by the same strategy of TCP. It is a
|
|
* fraction of global memory that is up to 1/2 at 256 MB, decreasing
|
|
* fraction of global memory that is up to 1/2 at 256 MB, decreasing
|
|
* toward zero with the amount of memory, with a floor of 128 pages.
|
|
* toward zero with the amount of memory, with a floor of 128 pages.
|
|
*/
|
|
*/
|
|
- limit = min(nr_all_pages, 1UL<<(28-PAGE_SHIFT)) >> (20-PAGE_SHIFT);
|
|
|
|
- limit = (limit * (nr_all_pages >> (20-PAGE_SHIFT))) >> (PAGE_SHIFT-11);
|
|
|
|
|
|
+ nr_pages = totalram_pages - totalhigh_pages;
|
|
|
|
+ limit = min(nr_pages, 1UL<<(28-PAGE_SHIFT)) >> (20-PAGE_SHIFT);
|
|
|
|
+ limit = (limit * (nr_pages >> (20-PAGE_SHIFT))) >> (PAGE_SHIFT-11);
|
|
limit = max(limit, 128UL);
|
|
limit = max(limit, 128UL);
|
|
sysctl_udp_mem[0] = limit / 4 * 3;
|
|
sysctl_udp_mem[0] = limit / 4 * 3;
|
|
sysctl_udp_mem[1] = limit;
|
|
sysctl_udp_mem[1] = limit;
|