[git pull] ia64 changes

[git pull] ia64 changes

[Luck, Tony]

This commit hit Linus upstream today and broke the ia64 build:

commit 1e8655f87333def92bb8215b423adc65403b08a5
Author: Ben Hutchings <ben@decadent.org.uk>
Date:   Sun Jul 18 21:51:42 2010 +0100

    drm/ttm: Fix build on architectures without AGP
    
    Make inclusion of <asm/agp.h> conditional on TTM_HAS_AGP.  The use
    of the functions declared in it is already conditional.
    
    Reported-by: Geert Stappers <stappers@stappers.nl>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Tested-by: Geert Stappers <stappers@stappers.nl>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
index b1d67dc..1f32b46 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
@@ -40,7 +40,9 @@
 #include <linux/slab.h>
 
 #include <asm/atomic.h>
+#ifdef TTM_HAS_AGP
 #include <asm/agp.h>
+#endif
 
 #include "ttm/ttm_bo_driver.h"
 #include "ttm/ttm_page_alloc.h"


The problem is that TTM_HAS_AGP is defined in "ttm/ttm_bo_driver.h" ... which
is included *after* you used it to test whether to include <asm/agp.h>

I suspect some re-arrangement is in order :-)

-Tony

[git pull] ia64 changes

[Luck, Tony]

Hi Linus,

please pull from:

	git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git release

This will update the files shown below.

Thanks!

-Tony

 arch/ia64/include/asm/unistd.h |    6 +++++-
 arch/ia64/kernel/entry.S       |    4 ++++
 fs/pstore/platform.c           |   15 ++++++++++++---
 3 files changed, 21 insertions(+), 4 deletions(-)

Tony Luck (2):
      [IA64] New syscalls for 2.6.39
      pstore: cleanups to pstore_dump()

[git pull] ia64 changes

[Luck, Tony]

Hi Linus,

please pull from:

	git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git release

This will update the files shown below. Both changes touch kernel/sched.c
to fix regressions ... one for a build problem, the other for a boot
problem.

Thanks!

-Tony

 kernel/sched.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

Mike Travis (1):
      Build fix for CONFIG_NUMA=y && CONFIG_SMP=n

Russ Anderson (1):
      [IA64] fix bootmem regression on Altix

Re: [git pull] ia64 changes

[Adrian Bunk]

On Thu, Apr 24, 2008 at 04:51:01PM -0700, Luck, Tony wrote:
>...
> Mike Travis (1):
>       Build fix for CONFIG_NUMA=y && CONFIG_SMP=n
>...

Why is this an allowed configuration on ia64?

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

RE: [git pull] ia64 changes

[Luck, Tony]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 632 bytes --]

>>       Build fix for CONFIG_NUMA=y && CONFIG_SMP=n
>>...
>
> Why is this an allowed configuration on ia64?

It shows up in allnoconfig ... probably because some
bit of Kconfig forces NUMA=y.

I can't imagine that it is ever a useful combination ... except to
find places in the code where people have:

#if defined(CONFIG_SMP)
 ...
#else

#if defined(CONFIG_NUMA) // !!! SMP=n, NUMA code???
  ...
#endif
#endif


Which is what happened, and is being fixed, here.

-Tony
ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥