The patch titled
kernel/power/snapshot.c: cleanups
has been removed from the -mm tree. Its filename is
kernel-power-snapshotc-cleanups.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: kernel/power/snapshot.c: cleanups
From: Adrian Bunk <bunk@xxxxxxxxx>
- make needlessly global functions static
- make dummy functions static inline
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Acked-by: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
kernel/power/snapshot.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff -puN kernel/power/snapshot.c~kernel-power-snapshotc-cleanups kernel/power/snapshot.c
--- a/kernel/power/snapshot.c~kernel-power-snapshotc-cleanups
+++ a/kernel/power/snapshot.c
@@ -122,7 +122,7 @@ static int restore_arch_mem(void)
}
#ifdef CONFIG_HIGHMEM
-unsigned int count_highmem_pages(void)
+static unsigned int count_highmem_pages(void)
{
struct zone *zone;
unsigned long zone_pfn;
@@ -199,7 +199,7 @@ static int save_highmem_zone(struct zone
return 0;
}
-int save_highmem(void)
+static int save_highmem(void)
{
struct zone *zone;
int res = 0;
@@ -216,7 +216,7 @@ int save_highmem(void)
return 0;
}
-int restore_highmem(void)
+static int restore_highmem(void)
{
printk("swsusp: Restoring Highmem\n");
while (highmem_copy) {
@@ -233,9 +233,9 @@ int restore_highmem(void)
return 0;
}
#else
-static unsigned int count_highmem_pages(void) {return 0;}
-static int save_highmem(void) {return 0;}
-static int restore_highmem(void) {return 0;}
+static inline unsigned int count_highmem_pages(void) {return 0;}
+static inline int save_highmem(void) {return 0;}
+static inline int restore_highmem(void) {return 0;}
#endif
unsigned int count_special_pages(void)
@@ -482,7 +482,8 @@ unsigned long get_safe_page(gfp_t gfp_ma
* On each page we set up a list of struct_pbe elements.
*/
-struct pbe *alloc_pagedir(unsigned int nr_pages, gfp_t gfp_mask, int safe_needed)
+static struct pbe *alloc_pagedir(unsigned int nr_pages, gfp_t gfp_mask,
+ int safe_needed)
{
unsigned int num;
struct pbe *pblist, *pbe;
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
origin.patch
acpiphp-use-new-dock-driver.patch
drivers-acpi-scanc-make-acpi_bus_type-static.patch
the-scheduled-unexport-of-insert_resource.patch
git-dvb.patch
drivers-media-video-vivic-make-2-functions-static.patch
drivers-media-video-pwc-make-code-static.patch
git-gfs2.patch
make-drivers-scsi-pata_pcmciacpcmcia_remove_one-static.patch
ni5010-netcard-cleanup-fix.patch
git-ocfs2.patch
gregkh-pci-acpiphp-configure-_prt-v3-cleanup.patch
drivers-scsi-aic7xxx-possible-cleanups.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-megaraidc-add-a-dummy-mega_create_proc_entry-for-proc_fs=y.patch
drivers-scsi-qla2xxx-make-some-functions-static.patch
drivers-scsi-qla2xxx-make-more-some-functions-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_done_with_status-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
drivers-scsi-aic7xxx-possible-cleanups-2.patch
usb-new-driver-for-cypress-cy7c63xxx-mirco-controllers-fix.patch
if-0-drivers-usb-input-hid-corechid_find_field_by_usage.patch
acx1xx-wireless-driver.patch
x86_64-unexport-ia32_sys_call_table.patch
fs-bufferc-possible-cleanups.patch
drivers-char-applicomc-proper-module_initexit.patch
kernel-sysc-cleanups.patch
kernel-sysc-cleanups-fix.patch
chardev-gpio-for-scx200-pc-8736x-replace-spinlocks-fix.patch
time-i386-clocksource-drivers.patch
drivers-ide-legacy-ide-csc-make-2-functions-static.patch
fbdev-cleanup-the-config_video_select-mess.patch
fbdev-remove-duplicate-includes.patch
fbdev-remove-unused-exports.patch
md-make-md_print_devices-static.patch
drivers-md-mdc-make-code-static.patch
slab-cache-shrinker-statistics.patch
i386-enable-4k-stacks-by-default.patch
mutex-subsystem-synchro-test-module.patch
drivers-char-ipmi-ipmi_msghandlerc-make-proc_ipmi_root-static.patch
drivers-message-i2o-iopc-unexport-i2o_msg_nop.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
