Merge

diff --cc arch/ia64/Makefile
index 91ac89227f03353f0a93ffb1212e16501b115f2e,558ba2b91f3d4ef5871f05431bd23accf443a1d7..01edd2602ff42c8c894c33b577876860136f6a14
--- 1/arch/ia64/Makefile
--- 2/arch/ia64/Makefile
+++ b/arch/ia64/Makefile
@@@ -48,18 -58,25 +58,24 @@@ drivers-$(CONFIG_IA64_HP_SIM)      += arch/i
  drivers-$(CONFIG_IA64_HP_ZX1) += arch/ia64/hp/common/ arch/ia64/hp/zx1/
  drivers-$(CONFIG_IA64_SGI_SN) += arch/ia64/sn/fakeprom/
  
- makeboot =$(Q)$(MAKE) -f scripts/Makefile.build obj=arch/ia64/boot $(1)
- maketool =$(Q)$(MAKE) -f scripts/Makefile.build obj=arch/ia64/tools $(1)
+ boot := arch/ia64/boot
+ tools := arch/ia64/tools
  
 -.PHONY: boot compressed archclean archmrproper include/asm-ia64/offsets.h
 +.PHONY: boot compressed include/asm-ia64/offsets.h
  
- all compressed: vmlinux.gz
+ all: vmlinux
+ 
+ compressed: vmlinux.gz
  
  vmlinux.gz: vmlinux
-       $(call makeboot,vmlinux.gz)
+       $(Q)$(MAKE) $(build)=$(boot) vmlinux.gz
+ 
+ check: vmlinux
+       arch/ia64/scripts/unwcheck.sh vmlinux
  
 -archmrproper:
  archclean:
-       $(Q)$(MAKE) -f scripts/Makefile.clean obj=arch/ia64/boot
+       $(Q)$(MAKE) $(clean)=$(boot)
+       $(Q)$(MAKE) $(clean)=$(tools)
  
  CLEAN_FILES += include/asm-ia64/offsets.h vmlinux.gz bootloader
  

diff --cc arch/ia64/kernel/Makefile
Simple merge

diff --cc arch/ia64/kernel/time.c
Simple merge

diff --cc arch/ia64/mm/hugetlbpage.c
index 37bcf76e2b632dda65b5fb0f4c6f96b262be5211,a20df7ccb198faf403fe34a1700f48a74a8093b3..a08a64c1d39d3c6646be16c6cf087d4a93d8a9ad
--- 1/arch/ia64/mm/hugetlbpage.c
--- 2/arch/ia64/mm/hugetlbpage.c
+++ b/arch/ia64/mm/hugetlbpage.c
@@@ -18,16 -17,19 +17,18 @@@
  #include <asm/tlb.h>
  #include <asm/tlbflush.h>
  
- struct list_head htlbpage_freelist;
- spinlock_t htlbpage_lock = SPIN_LOCK_UNLOCKED;
- extern long htlbpagemem;
+ #include <linux/sysctl.h>
+ 
+ static long    htlbpagemem;
+ int     htlbpage_max;
+ static long    htlbzone_pages;
  
- static void zap_hugetlb_resources (struct vm_area_struct *);
 -struct vm_operations_struct hugetlb_vm_ops;
+ static LIST_HEAD(htlbpage_freelist);
+ static spinlock_t htlbpage_lock = SPIN_LOCK_UNLOCKED;
  
- static struct page *
- alloc_hugetlb_page (void)
+ static struct page *alloc_hugetlb_page(void)
  {
-       struct list_head *curr, *head;
+       int i;
        struct page *page;
  
        spin_lock(&htlbpage_lock);
@@@ -339,7 -405,6 +400,7 @@@ static struct page *hugetlb_nopage(stru
        return NULL;
  }
  
- static struct vm_operations_struct hugetlb_vm_ops = {
+ struct vm_operations_struct hugetlb_vm_ops = {
 -      .nopage = hugetlb_nopage,
 +      .nopage =       hugetlb_nopage,
 +      .close =        zap_hugetlb_resources,
  };