[Linux-ia64] Fix RAW dependency introduced by HUGETLB patch

[Linux-ia64] Fix RAW dependency introduced by HUGETLB patch

[Peter Chubb]

Hi, 
If CONFIG_HUGETLB is not defined, you get a RAW dependency clash in
ivt.S. (2.5.39)


I believe this patch should fix it (but I'm not an IA64 assmebler
language expert!)

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.851   -> 1.852  
#	arch/ia64/kernel/ivt.S	1.10    -> 1.11   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/10/16	peterc@gelato.unsw.edu.au	1.852
# Fix RAW dependency when CONFIG_HUGETLB_PAGE is not defined.
# --------------------------------------------
#
diff -Nru a/arch/ia64/kernel/ivt.S b/arch/ia64/kernel/ivt.S
--- a/arch/ia64/kernel/ivt.S	Wed Oct 16 10:14:27 2002
+++ b/arch/ia64/kernel/ivt.S	Wed Oct 16 10:14:27 2002
@@ -116,8 +116,8 @@
 	;;
 (p8)	dep r25=r18,r25,2,6
 (p8)	shr r22=r22,HPAGE_SHIFT-PAGE_SHIFT
-	;;
 #endif
+	;;
 	cmp.eq p6,p7=5,r17			// is IFA pointing into to region 5?
 	shr.u r18=r22,PGDIR_SHIFT		// get bits 33-63 of the faulting address
 	;;

RE: [Linux-ia64] Fix RAW dependency introduced by HUGETLB patch

[Seth, Rohit]

Thanks Peter for the patch.

Bjorn, please apply this to your 2.4.19 kernel tree also.

thanks,
rohit


> -----Original Message-----
> From: Peter Chubb [mailto:peter@chubb.wattle.id.au] 
> Sent: Tuesday, October 15, 2002 5:16 PM
> To: linux-ia64@linuxia64.org; davidm@napali.hpl.hp.com; Seth, Rohit
> Subject: [Linux-ia64] Fix RAW dependency introduced by HUGETLB patch
> 
> 
> 
> Hi, 
> If CONFIG_HUGETLB is not defined, you get a RAW dependency 
> clash in ivt.S. (2.5.39)
> 
> 
> I believe this patch should fix it (but I'm not an IA64 
> assmebler language expert!)
> 
> # This is a BitKeeper generated patch for the following 
> project: # Project Name: Linux kernel tree # This patch 
> format is intended for GNU patch command version 2.5 or 
> higher. # This patch includes the following deltas:
> #	           ChangeSet	1.851   -> 1.852  
> #	arch/ia64/kernel/ivt.S	1.10    -> 1.11   
> #
> # The following is the BitKeeper ChangeSet Log
> # --------------------------------------------
> # 02/10/16	peterc@gelato.unsw.edu.au	1.852
> # Fix RAW dependency when CONFIG_HUGETLB_PAGE is not defined.
> # --------------------------------------------
> #
> diff -Nru a/arch/ia64/kernel/ivt.S b/arch/ia64/kernel/ivt.S
> --- a/arch/ia64/kernel/ivt.S	Wed Oct 16 10:14:27 2002
> +++ b/arch/ia64/kernel/ivt.S	Wed Oct 16 10:14:27 2002
> @@ -116,8 +116,8 @@
>  	;;
>  (p8)	dep r25=r18,r25,2,6
>  (p8)	shr r22=r22,HPAGE_SHIFT-PAGE_SHIFT
> -	;;
>  #endif
> +	;;
>  	cmp.eq p6,p7=5,r17			// is IFA 
> pointing into to region 5?
>  	shr.u r18=r22,PGDIR_SHIFT		// get bits 
> 33-63 of the faulting address
>  	;;
> 
> 
> _______________________________________________
> Linux-IA64 mailing list
> Linux-IA64@linuxia64.org 
> http://lists.linuxia64.org/lists/listinfo/linu> x-ia64
>