Skip to content

Commit f0d52c5

Browse files
committed
drivers: staging: ashmem: decouple ashmem from android
1 parent 37c406d commit f0d52c5

3 files changed

Lines changed: 6 additions & 2 deletions

File tree

drivers/staging/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ obj-$(CONFIG_USB_EMXX) += emxx_udc/
2323
obj-$(CONFIG_SPEAKUP) += speakup/
2424
obj-$(CONFIG_MFD_NVEC) += nvec/
2525
obj-$(CONFIG_ANDROID) += android/
26+
obj-$(CONFIG_ASHMEM) += android/
2627
obj-$(CONFIG_SYNC) += android/
2728
obj-$(CONFIG_STAGING_BOARD) += board/
2829
obj-$(CONFIG_LTE_GDM724X) += gdm724x/

drivers/staging/android/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
menu "Android"
22

3-
if ANDROID
4-
53
config ASHMEM
64
bool "Enable the Anonymous Shared Memory Subsystem"
75
default n
@@ -14,6 +12,8 @@ config ASHMEM
1412
It is, in theory, a good memory allocator for low-memory devices,
1513
because it can discard shared memory units when under memory pressure.
1614

15+
if ANDROID
16+
1717
config ANDROID_LOW_MEMORY_KILLER
1818
bool "Android Low Memory Killer"
1919
---help---

drivers/staging/android/ashmem.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include <linux/bitops.h>
3333
#include <linux/mutex.h>
3434
#include <linux/shmem_fs.h>
35+
#include <linux/module.h>
3536
#include "ashmem.h"
3637

3738
#define ASHMEM_NAME_PREFIX "dev/ashmem/"
@@ -885,3 +886,5 @@ static int __init ashmem_init(void)
885886
return ret;
886887
}
887888
device_initcall(ashmem_init);
889+
890+
MODULE_LICENSE("GPL v2");

0 commit comments

Comments
 (0)