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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source
This commit is contained in:
David S. Miller
2008-04-03 14:33:42 -07:00
parent 7feb49c82a 9597362d35
commit 3bb5da3837
613 changed files with 11364 additions and 7842 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/iomap.c
View File

@ -256,7 +256,7 @@ EXPORT_SYMBOL(ioport_unmap);
* */
void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
{
unsigned long start = pci_resource_start(dev, bar);
resource_size_t start = pci_resource_start(dev, bar);
unsigned long len = pci_resource_len(dev, bar);
unsigned long flags = pci_resource_flags(dev, bar);

2
lib/kobject_uevent.c
View File

@ -57,7 +57,7 @@ int kobject_action_type(const char *buf, size_t count,
enum kobject_action action;
int ret = -EINVAL;
if (count && buf[count-1] == '\n')
if (count && (buf[count-1] == '\n' || buf[count-1] == '\0'))
count--;
if (!count)