projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
[firefly-linux-kernel-4.4.55.git]
/
fs
/
coda
/
coda_linux.h
diff --git
a/fs/coda/coda_linux.h
b/fs/coda/coda_linux.h
index 44e17e9c21ae0a16e3c27b6a17e7e5be4bcab4f7..cc0ea9fe5ecf9af0ee79bfcd1b2ecdfdc4ac81da 100644
(file)
--- a/
fs/coda/coda_linux.h
+++ b/
fs/coda/coda_linux.h
@@
-59,12
+59,11
@@
void coda_sysctl_clean(void);
#define CODA_ALLOC(ptr, cast, size) do { \
if (size < PAGE_SIZE) \
#define CODA_ALLOC(ptr, cast, size) do { \
if (size < PAGE_SIZE) \
- ptr = k
m
alloc((unsigned long) size, GFP_KERNEL); \
+ ptr = k
z
alloc((unsigned long) size, GFP_KERNEL); \
else \
else \
- ptr = (cast)v
m
alloc((unsigned long) size); \
+ ptr = (cast)v
z
alloc((unsigned long) size); \
if (!ptr) \
printk("kernel malloc returns 0 at %s:%d\n", __FILE__, __LINE__); \
if (!ptr) \
printk("kernel malloc returns 0 at %s:%d\n", __FILE__, __LINE__); \
- else memset( ptr, 0, size ); \
} while (0)
} while (0)