Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Fix PCI resource mapping on sparc64
sparc64: Kill annoying warning when building compat_binfmt_elf.o
sparc32: kernel/trace/trace.c wants DIE_OOPS
sparc64: Fix __copy_{to,from}_user_inatomic defines.
+13
-5
+2
-2
arch/sparc/include/asm/processor_64.h
+2
-2
arch/sparc/include/asm/processor_64.h
···
36
36
#define VPTE_SIZE (1 << (VA_BITS - PAGE_SHIFT + 3))
37
37
#endif
38
38
39
-
#define TASK_SIZE ((unsigned long)-VPTE_SIZE)
40
39
#define TASK_SIZE_OF(tsk) \
41
40
(test_tsk_thread_flag(tsk,TIF_32BIT) ? \
42
-
(1UL << 32UL) : TASK_SIZE)
41
+
(1UL << 32UL) : ((unsigned long)-VPTE_SIZE))
42
+
#define TASK_SIZE TASK_SIZE_OF(current)
43
43
#ifdef __KERNEL__
44
44
45
45
#define STACK_TOP32 ((1UL << 32UL) - PAGE_SIZE)
+2
-2
arch/sparc/include/asm/uaccess_64.h
+2
-2
arch/sparc/include/asm/uaccess_64.h
···
265
265
266
266
#define strlen_user __strlen_user
267
267
#define strnlen_user __strnlen_user
268
-
#define __copy_to_user_inatomic __copy_to_user
269
-
#define __copy_from_user_inatomic __copy_from_user
268
+
#define __copy_to_user_inatomic ___copy_to_user
269
+
#define __copy_from_user_inatomic ___copy_from_user
270
270
271
271
#endif /* __ASSEMBLY__ */
272
272
+9
-1
arch/sparc64/kernel/pci.c
+9
-1
arch/sparc64/kernel/pci.c
···
889
889
890
890
for (i = 0; i <= PCI_ROM_RESOURCE; i++) {
891
891
struct resource *rp = &pdev->resource[i];
892
+
resource_size_t aligned_end;
892
893
893
894
/* Active? */
894
895
if (!rp->flags)
···
907
906
continue;
908
907
}
909
908
909
+
/* Align the resource end to the next page address.
910
+
* PAGE_SIZE intentionally added instead of (PAGE_SIZE - 1),
911
+
* because actually we need the address of the next byte
912
+
* after rp->end.
913
+
*/
914
+
aligned_end = (rp->end + PAGE_SIZE) & PAGE_MASK;
915
+
910
916
if ((rp->start <= user_paddr) &&
911
-
(user_paddr + user_size) <= (rp->end + 1UL))
917
+
(user_paddr + user_size) <= aligned_end)
912
918
break;
913
919
}
914
920