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/paulus/powerpc-merge
+29
-20
+10
-6
arch/powerpc/Makefile
+10
-6
arch/powerpc/Makefile
···
61
61
LDFLAGS_vmlinux := -Bstatic
62
62
63
63
# The -Iarch/$(ARCH)/include is temporary while we are merging
64
-
CPPFLAGS += -Iarch/$(ARCH) -Iarch/$(ARCH)/include
65
-
AFLAGS += -Iarch/$(ARCH)
66
-
CFLAGS += -Iarch/$(ARCH) -msoft-float -pipe
64
+
CPPFLAGS-$(CONFIG_PPC32) := -Iarch/$(ARCH) -Iarch/$(ARCH)/include
65
+
AFLAGS-$(CONFIG_PPC32) := -Iarch/$(ARCH)
67
66
CFLAGS-$(CONFIG_PPC64) := -mminimal-toc -mtraceback=none -mcall-aixdesc
68
-
CFLAGS-$(CONFIG_PPC32) := -ffixed-r2 -mmultiple
69
-
CFLAGS += $(CFLAGS-y)
67
+
CFLAGS-$(CONFIG_PPC32) := -Iarch/$(ARCH) -ffixed-r2 -mmultiple
68
+
CPPFLAGS += $(CPPFLAGS-y)
69
+
AFLAGS += $(AFLAGS-y)
70
+
CFLAGS += -msoft-float -pipe $(CFLAGS-y)
70
71
CPP = $(CC) -E $(CFLAGS)
71
72
# Temporary hack until we have migrated to asm-powerpc
72
-
LINUXINCLUDE += -Iarch/$(ARCH)/include
73
+
LINUXINCLUDE-$(CONFIG_PPC32) := -Iarch/$(ARCH)/include
74
+
LINUXINCLUDE += $(LINUXINCLUDE-y)
73
75
74
76
CHECKFLAGS += -m$(SZ) -D__powerpc__ -D__powerpc$(SZ)__
75
77
···
175
173
176
174
archprepare: checkbin
177
175
176
+
ifeq ($(CONFIG_PPC32),y)
178
177
# Temporary hack until we have migrated to asm-powerpc
179
178
include/asm: arch/$(ARCH)/include/asm
180
179
arch/$(ARCH)/include/asm: FORCE
181
180
$(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$(ARCH)/include; fi
182
181
$(Q)ln -fsn $(srctree)/include/asm-$(OLDARCH) arch/$(ARCH)/include/asm
182
+
endif
183
183
184
184
# Use the file '.tmp_gas_check' for binutils tests, as gas won't output
185
185
# to stdout and these checks are run even on install targets.
+1
-1
arch/powerpc/mm/hugetlbpage.c
+1
-1
arch/powerpc/mm/hugetlbpage.c
···
295
295
if (addr < 0x100000000UL)
296
296
err = open_low_hpage_areas(current->mm,
297
297
LOW_ESID_MASK(addr, len));
298
-
if ((addr + len) >= 0x100000000UL)
298
+
if ((addr + len) > 0x100000000UL)
299
299
err = open_high_hpage_areas(current->mm,
300
300
HTLB_AREA_MASK(addr, len));
301
301
if (err) {
+1
-1
arch/powerpc/platforms/iseries/iommu.c
+1
-1
arch/powerpc/platforms/iseries/iommu.c
+1
-1
arch/powerpc/platforms/pseries/iommu.c
+1
-1
arch/powerpc/platforms/pseries/iommu.c
+1
-1
arch/powerpc/sysdev/dart.h
+1
-1
arch/powerpc/sysdev/dart.h
···
1
1
/*
2
-
* Copyright (C) 2004 Olof Johansson <olof@austin.ibm.com>, IBM Corporation
2
+
* Copyright (C) 2004 Olof Johansson <olof@lixom.net>, IBM Corporation
3
3
*
4
4
* This program is free software; you can redistribute it and/or modify
5
5
* it under the terms of the GNU General Public License as published by
+2
-2
arch/powerpc/sysdev/u3_iommu.c
+2
-2
arch/powerpc/sysdev/u3_iommu.c
···
1
1
/*
2
2
* arch/powerpc/sysdev/u3_iommu.c
3
3
*
4
-
* Copyright (C) 2004 Olof Johansson <olof@austin.ibm.com>, IBM Corporation
4
+
* Copyright (C) 2004 Olof Johansson <olof@lixom.net>, IBM Corporation
5
5
*
6
6
* Based on pSeries_iommu.c:
7
7
* Copyright (C) 2001 Mike Corrigan & Dave Engebretsen, IBM Corporation
8
-
* Copyright (C) 2004 Olof Johansson <olof@austin.ibm.com>, IBM Corporation
8
+
* Copyright (C) 2004 Olof Johansson <olof@lixom.net>, IBM Corporation
9
9
*
10
10
* Dynamic DMA mapping support, Apple U3 & IBM CPC925 "DART" iommu.
11
11
*
+1
-1
include/asm-powerpc/iommu.h
+1
-1
include/asm-powerpc/iommu.h
···
1
1
/*
2
2
* Copyright (C) 2001 Mike Corrigan & Dave Engebretsen, IBM Corporation
3
3
* Rewrite, cleanup:
4
-
* Copyright (C) 2004 Olof Johansson <olof@austin.ibm.com>, IBM Corporation
4
+
* Copyright (C) 2004 Olof Johansson <olof@lixom.net>, IBM Corporation
5
5
*
6
6
* This program is free software; you can redistribute it and/or modify
7
7
* it under the terms of the GNU General Public License as published by
+11
-6
include/asm-powerpc/page_64.h
+11
-6
include/asm-powerpc/page_64.h
···
103
103
#define HTLB_AREA_SIZE (1UL << HTLB_AREA_SHIFT)
104
104
#define GET_HTLB_AREA(x) ((x) >> HTLB_AREA_SHIFT)
105
105
106
-
#define LOW_ESID_MASK(addr, len) (((1U << (GET_ESID(addr+len-1)+1)) \
107
-
- (1U << GET_ESID(addr))) & 0xffff)
106
+
#define LOW_ESID_MASK(addr, len) \
107
+
(((1U << (GET_ESID(min((addr)+(len)-1, 0x100000000UL))+1)) \
108
+
- (1U << GET_ESID(min((addr), 0x100000000UL)))) & 0xffff)
108
109
#define HTLB_AREA_MASK(addr, len) (((1U << (GET_HTLB_AREA(addr+len-1)+1)) \
109
110
- (1U << GET_HTLB_AREA(addr))) & 0xffff)
110
111
···
114
113
#define ARCH_HAS_SETCLEAR_HUGE_PTE
115
114
116
115
#define touches_hugepage_low_range(mm, addr, len) \
117
-
(LOW_ESID_MASK((addr), (len)) & (mm)->context.low_htlb_areas)
116
+
(((addr) < 0x100000000UL) \
117
+
&& (LOW_ESID_MASK((addr), (len)) & (mm)->context.low_htlb_areas))
118
118
#define touches_hugepage_high_range(mm, addr, len) \
119
-
(HTLB_AREA_MASK((addr), (len)) & (mm)->context.high_htlb_areas)
119
+
((((addr) + (len)) > 0x100000000UL) \
120
+
&& (HTLB_AREA_MASK((addr), (len)) & (mm)->context.high_htlb_areas))
120
121
121
122
#define __within_hugepage_low_range(addr, len, segmask) \
122
-
((LOW_ESID_MASK((addr), (len)) | (segmask)) == (segmask))
123
+
( (((addr)+(len)) <= 0x100000000UL) \
124
+
&& ((LOW_ESID_MASK((addr), (len)) | (segmask)) == (segmask)))
123
125
#define within_hugepage_low_range(addr, len) \
124
126
__within_hugepage_low_range((addr), (len), \
125
127
current->mm->context.low_htlb_areas)
126
128
#define __within_hugepage_high_range(addr, len, zonemask) \
127
-
((HTLB_AREA_MASK((addr), (len)) | (zonemask)) == (zonemask))
129
+
( ((addr) >= 0x100000000UL) \
130
+
&& ((HTLB_AREA_MASK((addr), (len)) | (zonemask)) == (zonemask)))
128
131
#define within_hugepage_high_range(addr, len) \
129
132
__within_hugepage_high_range((addr), (len), \
130
133
current->mm->context.high_htlb_areas)
+1
-1
include/asm-powerpc/tce.h
+1
-1
include/asm-powerpc/tce.h
···
1
1
/*
2
2
* Copyright (C) 2001 Mike Corrigan & Dave Engebretsen, IBM Corporation
3
3
* Rewrite, cleanup:
4
-
* Copyright (C) 2004 Olof Johansson <olof@austin.ibm.com>, IBM Corporation
4
+
* Copyright (C) 2004 Olof Johansson <olof@lixom.net>, IBM Corporation
5
5
*
6
6
* This program is free software; you can redistribute it and/or modify
7
7
* it under the terms of the GNU General Public License as published by