Commit a26e8430 authored by Tom Rini's avatar Tom Rini

Merge bk://ppc@ppc.bkbits.net/for-linus-ppc

into kernel.crashing.org:/home/trini/work/kernel/pristine/for-linus-ppc
parents f7504d67 74b6e8ac
...@@ -65,7 +65,13 @@ uImage: vmlinux ...@@ -65,7 +65,13 @@ uImage: vmlinux
$(Q)$(MAKE) $(build)=$(boot)/images $(boot)/images/$@ $(Q)$(MAKE) $(build)=$(boot)/images $(boot)/images/$@
define archhelp define archhelp
@echo '* zImage - Compressed kernel image (arch/$(ARCH)/boot/images/zImage.*)'
@echo ' uImage - Create a bootable image for U-Boot / PPCBoot' @echo ' uImage - Create a bootable image for U-Boot / PPCBoot'
@echo ' install - Install kernel using'
@echo ' (your) ~/bin/installkernel or'
@echo ' (distribution) /sbin/installkernel or'
@echo ' install to $$(INSTALL_PATH) and run lilo'
@echo ' *_defconfig - Select default config from arch/$(ARCH)/ppc/configs'
endef endef
archclean: archclean:
......
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
*/ */
#include <linux/config.h> #include <linux/config.h>
#include <linux/types.h>
#include <linux/serial.h>
#include <linux/serialP.h> #include <linux/serialP.h>
#include <linux/serial_reg.h> #include <linux/serial_reg.h>
#include <asm/serial.h> #include <asm/serial.h>
......
...@@ -59,11 +59,14 @@ static void add_node(struct device_node *np, struct proc_dir_entry *de) ...@@ -59,11 +59,14 @@ static void add_node(struct device_node *np, struct proc_dir_entry *de)
* Unfortunately proc_register puts each new entry * Unfortunately proc_register puts each new entry
* at the beginning of the list. So we rearrange them. * at the beginning of the list. So we rearrange them.
*/ */
ent = create_proc_read_entry(pp->name, S_IRUGO, de, ent = create_proc_read_entry(pp->name, strncmp(pp->name, "security-", 9) ?
property_read_proc, pp); S_IRUGO : S_IRUSR, de, property_read_proc, pp);
if (ent == 0) if (ent == 0)
break; break;
ent->size = pp->length; if (!strncmp(pp->name, "security-", 9))
ent->size = 0; /* don't leak number of password chars */
else
ent->size = pp->length;
*lastp = ent; *lastp = ent;
lastp = &ent->next; lastp = &ent->next;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment