projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'backport/v3.14.24-ltsi-rc1/phy-rcar-gen2-usb-to-v3.15' into backport/v3...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
include
/
linux
/
memory.h
diff --git
a/include/linux/memory.h
b/include/linux/memory.h
index
bb7384e
..
8b8d8d1
100644
(file)
--- a/
include/linux/memory.h
+++ b/
include/linux/memory.h
@@
-35,7
+35,7
@@
struct memory_block {
};
int arch_get_memory_phys_device(unsigned long start_pfn);
};
int arch_get_memory_phys_device(unsigned long start_pfn);
-unsigned long
__weak
memory_block_size_bytes(void);
+unsigned long memory_block_size_bytes(void);
/* These states are exposed to userspace as text strings in sysfs */
#define MEM_ONLINE (1<<0) /* exposed to userspace */
/* These states are exposed to userspace as text strings in sysfs */
#define MEM_ONLINE (1<<0) /* exposed to userspace */