On Thu, Nov 29, 2012 at 03:57:00PM +0000, Christoffer Dall wrote:

On Mon, Nov 19, 2012 at 9:14 AM, Will Deacon [off-list ref] wrote:

quoted

On Sat, Nov 10, 2012 at 03:42:17PM +0000, Christoffer Dall wrote:

quoted

+#ifdef CONFIG_ARM_LPAE
+#define s2_policy(policy)    policy
+#else
+#define s2_policy(policy)    0
+#endif

Put the macro in pgtable-{2,3}level.h?

I think that's weird, defining something far away from where it's used
will only make it harder to read, pgtable.h is not included in this
file, and there are other #ifdef CONFIG_ARM_LPAE in that file.

Of course pgtable.h is included in this file -- we have direct references to
L_PTE_MT_UNCACHED, for example, so by your logic we should inline all of
that too!

Yes, there are other CONFIG_ARM_LPAE checks in this file, but only where
there's a piece of code that is not applicable one way or the other. For
data definitions, it's really easy to fix in the headers so please do it
there instead.

Will