git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'secureexec-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
alpha
/
kernel
/
pci.c
diff --git
a/arch/alpha/kernel/pci.c
b/arch/alpha/kernel/pci.c
index 5f387ee5b5c5e0a69fb4817e9437cef5cf0c7cdd..8322df174bbfb84a4619123b6774d0cce8935dbf 100644
(file)
--- a/
arch/alpha/kernel/pci.c
+++ b/
arch/alpha/kernel/pci.c
@@
-379,11
+379,7
@@
alloc_pci_controller(void)
struct resource * __init
alloc_resource(void)
{
- struct resource *res;
-
- res = alloc_bootmem(sizeof(*res));
-
- return res;
+ return alloc_bootmem(sizeof(struct resource));
}