Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92eeb478 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm: use totalram_pages instead of num_physpages at runtime"

parents 77ea4f2d 3513b6c1

fs/fuse/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -786,7 +786,7 @@ static const struct super_operations fuse_super_operations = { 
static void sanitize_global_limit(unsigned *limit)

{

	if (*limit == 0)

		*limit = ((num_physpages << PAGE_SHIFT) >> 13) /

		*limit = ((totalram_pages << PAGE_SHIFT) >> 13) /

			 sizeof(struct fuse_req);



	if (*limit >= 1 << 16)

kernel/power/snapshot.c

+2 −2
Original line number Diff line number Diff line
@@ -1655,7 +1655,7 @@ unsigned long snapshot_get_image_size(void) 
static int init_header(struct swsusp_info *info)

{

	memset(info, 0, sizeof(struct swsusp_info));

	info->num_physpages = num_physpages;

	info->num_physpages = get_num_physpages();

	info->image_pages = nr_copy_pages;

	info->pages = snapshot_get_image_size();

	info->size = info->pages;
@@ -1799,7 +1799,7 @@ static int check_header(struct swsusp_info *info) 
	char *reason;



	reason = check_image_kernel(info);

	if (!reason && info->num_physpages != num_physpages)

	if (!reason && info->num_physpages != get_num_physpages())

		reason = "memory size";

	if (reason) {

		printk(KERN_ERR "PM: Image mismatch: %s\n", reason);

net/ipv4/inet_fragment.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ void inet_frags_init(struct inet_frags *f) 
	}

	rwlock_init(&f->lock);



	f->rnd = (u32) ((num_physpages ^ (num_physpages>>7)) ^

	f->rnd = (u32) ((totalram_pages ^ (totalram_pages >> 7)) ^

				   (jiffies ^ (jiffies >> 6)));



	setup_timer(&f->secret_timer, inet_frag_secret_rebuild,