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

Merge branch 'linux-2.6'

Browse Source
This commit is contained in:
Paul Mackerras
2007-02-07 14:05:13 +11:00
parent f03e64f2ca 62d0cfcb27
commit 8423200553
387 changed files with 3087 additions and 2533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/kernel/pci_64.c
View File

@@ -1429,7 +1429,7 @@ long sys_pciconfig_iobase(long which, unsigned long in_bus,
for (ln = pci_root_buses.next; ln != &pci_root_buses; ln = ln->next) {
bus = pci_bus_b(ln);
if (in_bus >= bus->number && in_bus < (bus->number + bus->subordinate))
if (in_bus >= bus->number && in_bus <= bus->subordinate)
break;
bus = NULL;
}

7
arch/powerpc/kernel/vdso.c
View File

@@ -284,6 +284,13 @@ int arch_setup_additional_pages(struct linux_binprm *bprm,
* pages though
*/
vma->vm_flags = VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC;
/*
* Make sure the vDSO gets into every core dump.
* Dumping its contents makes post-mortem fully interpretable later
* without matching up the same kernel and hardware config to see
* what PC values meant.
*/
vma->vm_flags |= VM_ALWAYSDUMP;
vma->vm_flags |= mm->def_flags;
vma->vm_page_prot = protection_map[vma->vm_flags & 0x7];
vma->vm_ops = &vdso_vmops;