staging: Remove the Android alarm-dev driver
RFC PATCH 1/2 staging: Remove the Android alarm-dev driver
The functionality provided by the Android alarm-dev driver should now be present in the timerfd interface (thanks to Greg Hackmann and Todd Poynor).
As of Lollipop, AOSP can make use of the timerfd if alarm-dev is not present (though a fixup for setting the rtc time if rtc0 isn't the backing for _ALARM clockids has been applied post-Lollipop).
Thus, we should be able to remove alarm-dev from staging.
--- drivers/staging/android/Kconfig | 9 - drivers/staging/android/alarm-dev.c | 446 --------------------------- drivers/staging/android/android_alarm.h | 41 --- drivers/staging/android/uapi/android_alarm.h | 62 ---- 4 files changed, 558 deletions(-) delete mode 100644 drivers/staging/android/alarm-dev.c delete mode 100644 drivers/staging/android/android_alarm.h delete mode 100644 drivers/staging/android/uapi/android_alarm.h
drivers/staging/android/Kconfig +0 -9
@@ -45,15 +45,6 @@ config ANDROID_LOW_MEMORY_KILLER ---help--- Registers processes to be killed when memory is low -config ANDROID_INTF_ALARM_DEV - tristate "Android alarm driver" - depends on RTC_CLASS - default n - ---help--- - Provides non-wakeup and rtc backed wakeup alarms based on rtc or - elapsed realtime, and a non-wakeup alarm on the monotonic clock. - Also exports the alarm interface to user-space. - config SYNC bool "Synchronization framework" default n
drivers/staging/android/alarm-dev.c deleted +0 -446
446 lines not on this page · raw message
drivers/staging/android/android_alarm.h deleted +0 -41
41 lines not on this page · raw message
drivers/staging/android/uapi/android_alarm.h deleted +0 -62
62 lines not on this page · raw message
Signature · 1 line
1.9.1
RFC PATCH 2/2 staging: Remove the Android logger driver
With the relase of Lollipop, Android no longer
requires the logger driver.
There are three patches which the android dev's
still need before they drop logger on all their
devices:
[PATCH v3 1/3] pstore: use scnprintf
[PATCH 2/3] pstore: remove superfluous memory size check [PATCH v2 3/3] pstore: add pmsg
But these seem to have been acked and are hopefully queued for upstream.
So this patch removes the logger driver from staging.
--- drivers/staging/android/Kconfig | 17 - drivers/staging/android/logger.c | 808 --------------------------------------- drivers/staging/android/logger.h | 89 ----- 3 files changed, 914 deletions(-) delete mode 100644 drivers/staging/android/logger.c delete mode 100644 drivers/staging/android/logger.h
drivers/staging/android/Kconfig +0 -17
@@ -14,23 +14,6 @@ config ASHMEM It is, in theory, a good memory allocator for low-memory devices, because it can discard shared memory units when under memory pressure. -config ANDROID_LOGGER - tristate "Android log driver" - default n - ---help--- - This adds support for system-wide logging using four log buffers. - - These are: - - 1: main - 2: events - 3: radio - 4: system - - Log reading and writing is performed via normal Linux reads and - optimized writes. This optimization avoids logging having too - much overhead in the system. - config ANDROID_TIMED_OUTPUT bool "Timed output class driver" default y
drivers/staging/android/logger.c deleted +0 -808
808 lines not on this page · raw message
drivers/staging/android/logger.h deleted +0 -89
89 lines not on this page · raw message
Signature · 1 line
1.9.1
Greg KH
maintainerRe: [PATCH 2/2][RFC] staging: Remove the Android logger driver
Quoted 7 lines · John Stultz
With the relase of Lollipop, Android no longer requires the logger driver.
There are three patches which the android dev's still need before they drop logger on all their devices:
Quoted 6 lines
[PATCH v3 1/3] pstore: use scnprintf
[PATCH 2/3] pstore: remove superfluous memory size check [PATCH v2 3/3] pstore: add pmsgBut these seem to have been acked and are hopefully queued for upstream.
That's great news, are these pstore patches in linux-next already? If so, I'll be glad to queue this up for 3.20.
thanks,
greg k-h
Greg KH
maintainerRe: [PATCH 2/2][RFC] staging: Remove the Android logger driver
In reply to John StultzQuoted 22 lines · John Stultz
With the relase of Lollipop, Android no longer
requires the logger driver.There are three patches which the android dev's
still need before they drop logger on all their
devices:[PATCH v3 1/3] pstore: use scnprintf
[PATCH 2/3] pstore: remove superfluous memory size check [PATCH v2 3/3] pstore: add pmsgBut these seem to have been acked and are hopefully queued for upstream.
So this patch removes the logger driver from staging.
Cc Rom Lemarchand <[email protected]>Cc Mark Salyzyn <[email protected]>Cc Kees Cook <[email protected]>Cc Android Kernel Team <[email protected]>Signed-off-by John Stultz <[email protected]>Acked-by Mark Salyzyn <[email protected]>
Quoted 7 lines
--- drivers/staging/android/Kconfig | 17 - drivers/staging/android/logger.c | 808 --------------------------------------- drivers/staging/android/logger.h | 89 ----- 3 files changed, 914 deletions(-) delete mode 100644 drivers/staging/android/logger.c delete mode 100644 drivers/staging/android/logger.h
For some reason this doesn't apply to my staging-testing branch of staging.git for some change in logger.c, can you refresh it and resend so I can apply it?
thanks,
greg k-h
PATCH 1/1 staging: Remove the Android logger driver
With the relase of Lollipop, Android no longer
requires the logger driver.
There are three patches which the android dev's
still need before they drop logger on all their
devices:
[PATCH v4 1/5] pstores: use scnprintf
[PATCH v2 2/5] pstore: remove superfluous memory size check
[PATCH 3/5] pstore: handle zero-sized prz in series
[PATCH v4 4/5] pstore: add pmsg
[PATCH 5/5] pstore: selinux: add security in-core xattr support for pstore and debugfs
But these seem to have been acked and are hopefully queued for upstream.
So this patch removes the logger driver from staging.
--- drivers/staging/android/Kconfig | 17 - drivers/staging/android/logger.c | 807 --------------------------------------- drivers/staging/android/logger.h | 89 ----- 3 files changed, 913 deletions(-) delete mode 100644 drivers/staging/android/logger.c delete mode 100644 drivers/staging/android/logger.h
drivers/staging/android/Kconfig +0 -17
@@ -14,23 +14,6 @@ config ASHMEM It is, in theory, a good memory allocator for low-memory devices, because it can discard shared memory units when under memory pressure. -config ANDROID_LOGGER - tristate "Android log driver" - default n - ---help--- - This adds support for system-wide logging using four log buffers. - - These are: - - 1: main - 2: events - 3: radio - 4: system - - Log reading and writing is performed via normal Linux reads and - optimized writes. This optimization avoids logging having too - much overhead in the system. - config ANDROID_TIMED_OUTPUT bool "Timed output class driver" default y
drivers/staging/android/logger.c deleted +0 -807
807 lines not on this page · raw message
drivers/staging/android/logger.h deleted +0 -89
89 lines not on this page · raw message
Signature · 1 line
1.9.1
Re: [PATCH] staging: Remove the Android logger driver
Quoted 18 lines · John Stultz
With the relase of Lollipop, Android no longer
requires the logger driver.There are three patches which the android dev's
still need before they drop logger on all their
devices:[PATCH v4 1/5] pstores: use scnprintf
[PATCH v2 2/5] pstore: remove superfluous memory size check
[PATCH 3/5] pstore: handle zero-sized prz in series
[PATCH v4 4/5] pstore: add pmsg
[PATCH 5/5] pstore: selinux: add security in-core xattr support for pstore and debugfsBut these seem to have been acked and are hopefully queued for upstream.
So this patch removes the logger driver from staging.
Quoted 8 lines
Cc Rom Lemarchand <[email protected]>,Cc Mark Salyzyn <[email protected]>Cc Kees Cook <[email protected]>Cc Android Kernel Team <[email protected]>Cc Greg KH <[email protected]>Signed-off-by John Stultz <[email protected]>--- drivers/staging/android/Kconfig | 17 -
Please include the change that would add
drivers/staging/android/Makefile | 1 -
Quoted 5 lines
drivers/staging/android/logger.c | 807 --------------------------------------- drivers/staging/android/logger.h | 89 ----- 3 files changed, 913 deletions(-) delete mode 100644 drivers/staging/android/logger.c delete mode 100644 drivers/staging/android/logger.h
That is also delete this line:
obj-$(CONFIG_ANDROID_LOGGER) += logger.o
Thanks,
Paul Bolle
Quoted 9 lines · John Stultz
The functionality provided by the Android alarm-dev driver should now be present in the timerfd interface (thanks to Greg Hackmann and Todd Poynor).
As of Lollipop, AOSP can make use of the timerfd if alarm-dev is not present (though a fixup for setting the rtc time if rtc0 isn't the backing for
_ALARMclockids has been applied post-Lollipop).
Quoted 8 lines
Thus, we should be able to remove alarm-dev from staging.
Cc Greg Hackmann <[email protected]>Cc Elliott Hughes <[email protected]>Cc Todd Poynor <[email protected]>Cc Android Kernel Team <[email protected]>Cc Greg KH <[email protected]>Signed-off-by John Stultz <[email protected]>
This became commit 5da41e925656 ("staging: Remove the Android alarm-dev driver") in today's linux-next (ie, next-20150127). I noticed because a script I use to check linux-next spotted a minor problem with it.
Quoted 1 line
drivers/staging/android/Kconfig | 9 -
Here there should have been a line reading
drivers/staging/android/Makefile | 1 -
Quoted 7 lines
drivers/staging/android/alarm-dev.c | 446 --------------------------- drivers/staging/android/android_alarm.h | 41 --- drivers/staging/android/uapi/android_alarm.h | 62 ---- 4 files changed, 558 deletions(-) delete mode 100644 drivers/staging/android/alarm-dev.c delete mode 100644 drivers/staging/android/android_alarm.h delete mode 100644 drivers/staging/android/uapi/android_alarm.h
Is a trivial patch to remove that Makefile line, the one that references CONFIG_ANDROID_INTF_ALARM_DEV and alarm-dev.o, queued already?
Thanks,
Paul Bolle
Quoted 19 lines · Paul Bolle
Quoted 9 lines · John Stultz
The functionality provided by the Android alarm-dev driver should now be present in the timerfd interface (thanks to Greg Hackmann and Todd Poynor).
As of Lollipop, AOSP can make use of the timerfd if alarm-dev is not present (though a fixup for setting the rtc time if rtc0 isn't the backing for
_ALARMclockids has been applied post-Lollipop).Quoted 8 lines
Thus, we should be able to remove alarm-dev from staging.
Cc Greg Hackmann <[email protected]>Cc Elliott Hughes <[email protected]>Cc Todd Poynor <[email protected]>Cc Android Kernel Team <[email protected]>Cc Greg KH <[email protected]>Signed-off-by John Stultz <[email protected]>
Quoted 8 lines
This became commit
5da41e925656("staging: Remove the Android alarm-dev driver") in today's linux-next (ie, next-20150127). I noticed because a script I use to check linux-next spotted a minor problem with it.Quoted 1 line
drivers/staging/android/Kconfig | 9 -Here there should have been a line reading
drivers/staging/android/Makefile | 1 -
Oh grumble. You're right. I'll send a cleanup patch in.
Thanks for catching this!
-john
PATCH 1/1 staging: Remove logger and alarm-dev from android Makefile
In reply to Paul BolleMy previous patches deleting logger and alarm-dev from staging missed the android Makefile.
This patch cleans up the Makefile to remove the now non-existent files.
--- drivers/staging/android/Makefile | 2 -- 1 file changed, 2 deletions(-)
drivers/staging/android/Makefile +0 -2
@@ -3,10 +3,8 @@ ccflags-y += -I$(src) # needed for trace events obj-y += ion/ obj-$(CONFIG_ASHMEM) += ashmem.o -obj-$(CONFIG_ANDROID_LOGGER) += logger.o obj-$(CONFIG_ANDROID_TIMED_OUTPUT) += timed_output.o obj-$(CONFIG_ANDROID_TIMED_GPIO) += timed_gpio.o obj-$(CONFIG_ANDROID_LOW_MEMORY_KILLER) += lowmemorykiller.o -obj-$(CONFIG_ANDROID_INTF_ALARM_DEV) += alarm-dev.o obj-$(CONFIG_SYNC) += sync.o sync_debug.o obj-$(CONFIG_SW_SYNC) += sw_sync.o
Signature · 1 line
1.9.1
Re: [PATCH] staging: Remove logger and alarm-dev from android Makefile
Quoted 6 lines · John Stultz
My previous patches deleting logger and alarm-dev from staging missed the android
Makefile.This patch cleans up the
Makefileto remove the now non-existent files.
Quoted 11 lines
Cc Rom Lemarchand <[email protected]>,Cc Mark Salyzyn <[email protected]>,Cc Kees Cook <[email protected]>,Cc Android Kernel Team <[email protected]>,Cc Greg KH <[email protected]>Cc Valentin Rothberg <[email protected]>,Cc Greg Hackmann <[email protected]>,Cc Elliott Hughes <[email protected]>,Cc Todd Poynor <[email protected]>,Reported-by Paul Bolle <[email protected]>Signed-off-by John Stultz <[email protected]>
Looks right to me. :)
-Kees
Quoted 22 lines
--- drivers/staging/android/Makefile | 2 -- 1 file changed, 2 deletions(-)drivers/staging/android/Makefile +0
-3@@ -3,10 +3,8 @@ ccflags-y += -I$(src) # needed for trace events obj-y += ion/ obj-$(CONFIG_ASHMEM) += ashmem.o -obj-$(CONFIG_ANDROID_LOGGER) += logger.o obj-$(CONFIG_ANDROID_TIMED_OUTPUT) += timed_output.o obj-$(CONFIG_ANDROID_TIMED_GPIO) += timed_gpio.o obj-$(CONFIG_ANDROID_LOW_MEMORY_KILLER) += lowmemorykiller.o -obj-$(CONFIG_ANDROID_INTF_ALARM_DEV) += alarm-dev.o obj-$(CONFIG_SYNC) += sync.o sync_debug.o obj-$(CONFIG_SW_SYNC) += sw_sync.o --1.9.1
Signature · 2 lines
Kees Cook Chrome OS Security