From mboxrd@z Thu Jan 1 00:00:00 1970 From: Manik Raina Date: Fri, 21 Jun 2002 08:04:25 +0000 Subject: Re: [Linux-ia64] Re: [Trivial Patch] : (2.5 latest) MIME-Version: 1 Content-Type: multipart/mixed; boundary="------------EB9D6FF9BE10E3414CAB0A7D" Message-Id: List-Id: References: In-Reply-To: To: linux-ia64@vger.kernel.org This is a multi-part message in MIME format. --------------EB9D6FF9BE10E3414CAB0A7D Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by sj-msg-core-3.cisco.com id g5L84ZAB015796 =09 thanks, new diffs attached=20 Andreas Schwab wrote: >=20 > Manik Raina writes: >=20 > |> diff -u -r linux-2.5.22/include/asm-ia64/delay.h linux-likely-patch/= include/asm-ia64/delay.h > |> --- linux-2.5.22/include/asm-ia64/delay.h Mon Jun 17 08:01:23 200= 2 > |> +++ linux-likely-patch/include/asm-ia64/delay.h Fri Jun 21 11:1= 8:00 2002 > |> @@ -15,6 +15,7 @@ > |> #include > |> #include > |> #include > |> +#include > |> > |> #include > |> > |> @@ -52,7 +53,7 @@ > |> > |> __asm__ __volatile__("mov %0=3Dar.itc" : "=3Dr"(result) :: "mem= ory"); > |> #ifdef CONFIG_ITANIUM > |> - while (__builtin_expect ((__s32) result =3D=3D -1, 0)) > |> + while (unlikely((__s32) result =3D=3D -1) >=20 > This doesn't compile, it lacks a paren. >=20 > Andreas. >=20 > -- > Andreas Schwab, SuSE Labs, schwab@suse.de > SuSE Linux AG, Deutschherrnstr. 15-19, D-90429 N=FCrnberg > Key fingerprint =3D 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 > "And now for something completely different." --------------EB9D6FF9BE10E3414CAB0A7D Content-Type: text/plain; charset=us-ascii; name="new" Content-Disposition: inline; filename="new" Content-Transfer-Encoding: 7bit diff -u -r linux-2.5.22/include/asm-ia64/delay.h linux-likely-patch/include/asm-ia64/delay.h --- linux-2.5.22/include/asm-ia64/delay.h Mon Jun 17 08:01:23 2002 +++ linux-likely-patch/include/asm-ia64/delay.h Fri Jun 21 11:18:00 2002 @@ -15,6 +15,7 @@ #include #include #include +#include #include @@ -52,7 +53,7 @@ __asm__ __volatile__("mov %0=ar.itc" : "=r"(result) :: "memory"); #ifdef CONFIG_ITANIUM - while (__builtin_expect ((__s32) result == -1, 0)) + while (unlikely((__s32) result == -1)) __asm__ __volatile__("mov %0=ar.itc" : "=r"(result) :: "memory"); #endif return result; diff -u -r linux-2.5.22/include/asm-ia64/pgalloc.h linux-likely-patch/include/asm-ia64/pgalloc.h --- linux-2.5.22/include/asm-ia64/pgalloc.h Mon Jun 17 08:01:23 2002 +++ linux-likely-patch/include/asm-ia64/pgalloc.h Fri Jun 21 11:18:00 2002 @@ -17,6 +17,7 @@ #include #include +#include #include #include @@ -37,7 +38,7 @@ { unsigned long *ret = pgd_quicklist; - if (__builtin_expect(ret != NULL, 1)) { + if (likely(ret != NULL)) { pgd_quicklist = (unsigned long *)(*ret); ret[0] = 0; --pgtable_cache_size; @@ -52,9 +53,9 @@ /* the VM system never calls pgd_alloc_one_fast(), so we do it here. */ pgd_t *pgd = pgd_alloc_one_fast(mm); - if (__builtin_expect(pgd == NULL, 0)) { + if (unlikely(pgd == NULL)) { pgd = (pgd_t *)__get_free_page(GFP_KERNEL); - if (__builtin_expect(pgd != NULL, 1)) + if (likely(pgd != NULL)) clear_page(pgd); } return pgd; @@ -80,7 +81,7 @@ { unsigned long *ret = (unsigned long *)pmd_quicklist; - if (__builtin_expect(ret != NULL, 1)) { + if (likely(ret != NULL)) { pmd_quicklist = (unsigned long *)(*ret); ret[0] = 0; --pgtable_cache_size; @@ -93,7 +94,7 @@ { pmd_t *pmd = (pmd_t *) __get_free_page(GFP_KERNEL); - if (__builtin_expect(pmd != NULL, 1)) + if (likely(pmd != NULL)) clear_page(pmd); return pmd; } @@ -125,7 +126,7 @@ { struct page *pte = alloc_pages(GFP_KERNEL, 0); - if (__builtin_expect(pte != NULL, 1)) + if (likely(pte != NULL)) clear_page(page_address(pte)); return pte; } @@ -135,7 +136,7 @@ { pte_t *pte = (pte_t *) __get_free_page(GFP_KERNEL); - if (__builtin_expect(pte != NULL, 1)) + if (likely(pte != NULL)) clear_page(pte); return pte; } diff -u -r linux-2.5.22/include/asm-ia64/processor.h linux-likely-patch/include/asm-ia64/processor.h --- linux-2.5.22/include/asm-ia64/processor.h Mon Jun 17 08:01:30 2002 +++ linux-likely-patch/include/asm-ia64/processor.h Fri Jun 21 11:18:00 2002 @@ -16,6 +16,7 @@ #include #include +#include #include #include @@ -283,7 +284,7 @@ regs->loadrs = 0; \ regs->r8 = current->mm->dumpable; /* set "don't zap registers" flag */ \ regs->r12 = new_sp - 16; /* allocate 16 byte scratch area */ \ - if (!__builtin_expect (current->mm->dumpable, 1)) { \ + if (unlikely(!current->mm->dumpable)) { \ /* \ * Zap scratch regs to avoid leaking bits between processes with different \ * uid/privileges. \ diff -u -r linux-2.5.22/include/asm-ia64/softirq.h linux-likely-patch/include/asm-ia64/softirq.h --- linux-2.5.22/include/asm-ia64/softirq.h Mon Jun 17 08:01:35 2002 +++ linux-likely-patch/include/asm-ia64/softirq.h Fri Jun 21 11:34:04 2002 @@ -6,6 +6,7 @@ * David Mosberger-Tang */ #include +#include #define __local_bh_enable() do { barrier(); really_local_bh_count()--; } while (0) @@ -13,7 +14,7 @@ #define local_bh_enable() \ do { \ __local_bh_enable(); \ - if (__builtin_expect(local_softirq_pending(), 0) && really_local_bh_count() == 0) \ + if (unlikely(local_softirq_pending()) && really_local_bh_count() == 0) \ do_softirq(); \ } while (0) --------------EB9D6FF9BE10E3414CAB0A7D--