- time-use-clocksource-infrastructure-for-update_wall_time-mark-few-functions-as-__init.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled

     Mark few functions as __init

has been removed from the -mm tree.  Its filename is

     time-use-clocksource-infrastructure-for-update_wall_time-mark-few-functions-as-__init.patch

This patch was dropped because it was folded into time-use-clocksource-infrastructure-for-update_wall_time.patch

------------------------------------------------------
Subject: Mark few functions as __init
From: OGAWA Hirofumi <hirofumi@xxxxxxxxxxxxxxxxxx>


Signed-off-by: OGAWA Hirofumi <hirofumi@xxxxxxxxxxxxxxxxxx>
Cc: john stultz <johnstul@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 kernel/time/clocksource.c |    4 ++--
 kernel/timer.c            |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff -puN kernel/time/clocksource.c~time-use-clocksource-infrastructure-for-update_wall_time-mark-few-functions-as-__init kernel/time/clocksource.c
--- a/kernel/time/clocksource.c~time-use-clocksource-infrastructure-for-update_wall_time-mark-few-functions-as-__init
+++ a/kernel/time/clocksource.c
@@ -56,7 +56,7 @@ static int finished_booting;
  *
  * Hack to avoid lots of clocksource churn at boot time
  */
-static int clocksource_done_booting(void)
+static int __init clocksource_done_booting(void)
 {
 	finished_booting = 1;
 	return 0;
@@ -289,7 +289,7 @@ static struct sys_device device_clocksou
 	.cls	= &clocksource_sysclass,
 };
 
-static int init_clocksource_sysfs(void)
+static int __init init_clocksource_sysfs(void)
 {
 	int error = sysdev_class_register(&clocksource_sysclass);
 
diff -puN kernel/timer.c~time-use-clocksource-infrastructure-for-update_wall_time-mark-few-functions-as-__init kernel/timer.c
--- a/kernel/timer.c~time-use-clocksource-infrastructure-for-update_wall_time-mark-few-functions-as-__init
+++ a/kernel/timer.c
@@ -799,7 +799,7 @@ static cycle_t last_clock_cycle;  /* cyc
 /*
  * timekeeping_init - Initializes the clocksource and common timekeeping values
  */
-void timekeeping_init(void)
+void __init timekeeping_init(void)
 {
 	unsigned long flags;
 
@@ -842,7 +842,7 @@ static struct sys_device device_timer = 
 	.cls		= &timekeeping_sysclass,
 };
 
-static int timekeeping_init_device(void)
+static int __init timekeeping_init_device(void)
 {
 	int error = sysdev_class_register(&timekeeping_sysclass);
 	if (!error)
_

Patches currently in -mm which might be from hirofumi@xxxxxxxxxxxxxxxxxx are

origin.patch
time-clocksource-infrastructure.patch
time-use-clocksource-infrastructure-for-update_wall_time.patch
time-use-clocksource-infrastructure-for-update_wall_time-mark-few-functions-as-__init.patch
time-i386-clocksource-drivers-pm-timer-doesnt-use-workaround-if-chipset-is-not-buggy.patch
time-i386-clocksource-drivers-pm-timer-doesnt-use-workaround-if-chipset-is-not-buggy-acpi_pm-cleanup.patch
time-i386-clocksource-drivers-pm-timer-doesnt-use-workaround-if-chipset-is-not-buggy-acpi_pm-cleanup-fix-missing-to-rename-pmtmr_good-to-acpi_pm_good.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

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux