lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'linus' into core/percpu

Browse Source 
Conflicts:
	arch/x86/kernel/setup_percpu.c
This commit is contained in:
Ingo Molnar
2009-01-27 12:01:51 +01:00
parent 5a611268b6 5ee8100721
commit 3ddeb51d9c
944 changed files with 12560 additions and 5881 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/firmware/dell_rbu.c
View File

@@ -576,7 +576,7 @@ static ssize_t read_rbu_image_type(struct kobject *kobj,
{
int size = 0;
if (!pos)
size = sprintf(buffer, "%s\n", image_type);
size = scnprintf(buffer, count, "%s\n", image_type);
return size;
}
@@ -648,7 +648,7 @@ static ssize_t read_rbu_packet_size(struct kobject *kobj,
int size = 0;
if (!pos) {
spin_lock(&rbu_data.lock);
size = sprintf(buffer, "%lu\n", rbu_data.packetsize);
size = scnprintf(buffer, count, "%lu\n", rbu_data.packetsize);
spin_unlock(&rbu_data.lock);
}
return size;