From: Adrian Bunk <bunk@stusta.de>
To: Andrew Morton <akpm@osdl.org>, "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: linux-pm@osdl.org, linux-kernel@vger.kernel.org
Subject: [RFC: -mm patch] swsusp: make some code static
Date: Thu, 12 Jan 2006 11:48:12 +0100 [thread overview]
Message-ID: <20060112104812.GR29663@stusta.de> (raw)
In-Reply-To: <20060111042135.24faf878.akpm@osdl.org>
[-- Attachment #1: Type: text/plain, Size: 2134 bytes --]
On Wed, Jan 11, 2006 at 04:21:35AM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.15-mm2:
>...
> +swsusp-low-level-interface-rev-2.patch
>...
> swsusp updates
>...
After this patch, we can make some code static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
include/linux/swap.h | 1 -
kernel/power/power.h | 1 -
kernel/power/snapshot.c | 4 ++--
mm/swapfile.c | 2 +-
4 files changed, 3 insertions(+), 5 deletions(-)
--- linux-2.6.15-mm3-full/kernel/power/power.h.old 2006-01-12 01:01:49.000000000 +0100
+++ linux-2.6.15-mm3-full/kernel/power/power.h 2006-01-12 01:01:55.000000000 +0100
@@ -48,7 +48,6 @@
/* References to section boundaries */
extern const void __nosave_begin, __nosave_end;
-extern unsigned int nr_copy_pages;
extern struct pbe *pagedir_nosave;
/* Preferred image size in MB (default 500) */
--- linux-2.6.15-mm3-full/kernel/power/snapshot.c.old 2006-01-12 01:02:03.000000000 +0100
+++ linux-2.6.15-mm3-full/kernel/power/snapshot.c 2006-01-12 01:02:18.000000000 +0100
@@ -35,8 +35,8 @@
#include "power.h"
struct pbe *pagedir_nosave;
-unsigned int nr_copy_pages;
-unsigned int nr_meta_pages;
+static unsigned int nr_copy_pages;
+static unsigned int nr_meta_pages;
#ifdef CONFIG_HIGHMEM
unsigned int count_highmem_pages(void)
--- linux-2.6.15-mm3-full/include/linux/swap.h.old 2006-01-12 01:04:21.000000000 +0100
+++ linux-2.6.15-mm3-full/include/linux/swap.h 2006-01-12 01:04:33.000000000 +0100
@@ -232,7 +232,6 @@
/* linux/mm/swapfile.c */
extern long total_swap_pages;
extern unsigned int nr_swapfiles;
-extern struct swap_info_struct swap_info[];
extern void si_swapinfo(struct sysinfo *);
extern swp_entry_t get_swap_page(void);
extern swp_entry_t get_swap_page_of_type(int);
--- linux-2.6.15-mm3-full/mm/swapfile.c.old 2006-01-12 01:04:42.000000000 +0100
+++ linux-2.6.15-mm3-full/mm/swapfile.c 2006-01-12 01:04:51.000000000 +0100
@@ -44,7 +44,7 @@
struct swap_list_t swap_list = {-1, -1};
-struct swap_info_struct swap_info[MAX_SWAPFILES];
+static struct swap_info_struct swap_info[MAX_SWAPFILES];
static DECLARE_MUTEX(swapon_sem);
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
next parent reply other threads:[~2006-01-12 10:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20060111042135.24faf878.akpm@osdl.org>
2006-01-12 10:48 ` Adrian Bunk [this message]
2006-01-12 15:29 ` [RFC: -mm patch] swsusp: make some code static Pavel Machek
2006-01-12 16:18 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060112104812.GR29663@stusta.de \
--to=bunk@stusta.de \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@osdl.org \
--cc=rjw@sisk.pl \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox