From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>
Cc: linux-next@vger•kernel.org, Paul Mackerras <paulus@samba•org>,
Benjamin Herrenschmidt <benh@kernel•crashing.org>,
linuxppc-dev@ozlabs•org, Jeremy Fitzhardinge <jeremy@goop•org>,
Becky Bruce <becky.bruce@freescale•com>,
Kumar Gala <galak@kernel•crashing.org>
Subject: linux-next: manual merge of the tip-core tree
Date: Tue, 14 Oct 2008 15:23:58 +1100 [thread overview]
Message-ID: <20081014152358.3e92d57b.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1717 bytes --]
Hi all,
Today's linux-next merge of the tip-core tree got a conflict in
arch/powerpc/platforms/Kconfig.cputype between commit
4ee7084eb11e00eb02dc8435fd18273a61ffa9bf ("Allow 32-bit hashed pgtable
code to support 36-bit physical") from the powerpc tree and commit
8308c54d7e312f7a03e2ce2057d0837e6fe3843f ("redefine resource_size_t as
phys_addr_t") from the tip-core tree.
Just context. I fixed it up (see below) and can carry the fix (assuming
it is correct).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc arch/powerpc/platforms/Kconfig.cputype
index 439c5ba,be852fd..0000000
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@@ -129,20 -128,17 +129,19 @@@ config FSL_EMB_PERFMO
config PTE_64BIT
bool
- depends on 44x || E500
- default y if 44x
- default y if E500 && PHYS_64BIT
+ depends on 44x || E500 || PPC_86xx
+ default y if PHYS_64BIT
config PHYS_64BIT
- bool 'Large physical address support' if E500
- depends on 44x || E500
- default y if 44x
+ bool 'Large physical address support' if E500 || PPC_86xx
+ depends on (44x || E500 || PPC_86xx) && !PPC_83xx && !PPC_82xx
- select RESOURCES_64BIT
---help---
This option enables kernel support for larger than 32-bit physical
- addresses. This features is not be available on all e500 cores.
+ addresses. This feature may not be available on all cores.
+
+ If you have more than 3.5GB of RAM or so, you also need to enable
+ SWIOTLB under Kernel Options for this to work. The actual number
+ is platform-dependent.
If in doubt, say N here.
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2008-10-14 4:42 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-14 4:23 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-10-14 4:24 linux-next: manual merge of the tip-core tree Stephen Rothwell
2008-08-04 1:08 Stephen Rothwell
2008-07-08 0:16 Stephen Rothwell
2008-07-07 3:15 Stephen Rothwell
2008-07-07 6:12 ` Ingo Molnar
2008-07-07 6:39 ` Stephen Rothwell
2008-06-25 0:49 Stephen Rothwell
2008-06-25 3:51 ` Jeremy Fitzhardinge
2008-06-25 9:17 ` Ingo Molnar
2008-06-25 16:13 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081014152358.3e92d57b.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=becky.bruce@freescale$(echo .)com \
--cc=benh@kernel$(echo .)crashing.org \
--cc=galak@kernel$(echo .)crashing.org \
--cc=hpa@zytor$(echo .)com \
--cc=jeremy@goop$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linuxppc-dev@ozlabs$(echo .)org \
--cc=mingo@elte$(echo .)hu \
--cc=paulus@samba$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox