public inbox for linux-ia64@vger.kernel.org
 help / color / mirror / Atom feed
* [Linux-ia64] Re: [Trivial Patch] : (2.5 latest) More __builtin_expect() cleanup in
@ 2002-06-21  5:51 Manik Raina
  2002-06-21  6:10 ` Manik Raina
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Manik Raina @ 2002-06-21  5:51 UTC (permalink / raw)
  To: linux-ia64

[-- Attachment #1: Type: text/plain, Size: 825 bytes --]


	There you are Rusty, i've made the changes as suggested, verified it
	patches with -p1 . Patch attached.


Rusty Russell wrote:
> 
> In message <3D117C53.2B4F7C53@cisco.com> you write:
> >       Copying Rusty as well.
> >
> >       Changed files in the include/asm-ia64 directory to get rid of
> >       __builtin_expect() in favour of likely/unlikely.
> 
> Hi Manik,
> 
>         You got a reject because these patches do not apply with -p1
> (diffs should be taken from one level, furthur down as Linux norm).
> 
> The other issue is:
> > -     if (!__builtin_expect (current->mm->dumpable, 1)) {
>                         \
> > +     if (!likely (current->mm->dumpable)) {
> 
> if (unlikely(!current->mm->dumpable)), please!
> 
> Thanks,
> Rusty.
> --
>   Anyone who quotes me in their sig is an idiot. -- Rusty Russell.

[-- Attachment #2: rusty.patch --]
[-- Type: text/plain, Size: 3724 bytes --]

diff -u -r linux-2.5.22/include/asm-ia64/delay.h real/include/asm-ia64/delay.h
--- linux-2.5.22/include/asm-ia64/delay.h	Mon Jun 17 08:01:23 2002
+++ real/include/asm-ia64/delay.h	Fri Jun 21 10:39:34 2002
@@ -15,6 +15,7 @@
 #include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/compiler.h>
 
 #include <asm/processor.h>
 
@@ -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 real/include/asm-ia64/pgalloc.h
--- linux-2.5.22/include/asm-ia64/pgalloc.h	Mon Jun 17 08:01:23 2002
+++ real/include/asm-ia64/pgalloc.h	Fri Jun 21 10:43:09 2002
@@ -17,6 +17,7 @@
 
 #include <linux/mm.h>
 #include <linux/threads.h>
+#include <linux/compiler.h>
 
 #include <asm/mmu_context.h>
 #include <asm/processor.h>
@@ -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 real/include/asm-ia64/processor.h
--- linux-2.5.22/include/asm-ia64/processor.h	Mon Jun 17 08:01:30 2002
+++ real/include/asm-ia64/processor.h	Fri Jun 21 10:43:48 2002
@@ -16,6 +16,7 @@
 #include <linux/config.h>
 
 #include <linux/percpu.h>
+#include <linux/compiler.h>
 
 #include <asm/ptrace.h>
 #include <asm/kregs.h>
@@ -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 real/include/asm-ia64/softirq.h
--- linux-2.5.22/include/asm-ia64/softirq.h	Mon Jun 17 08:01:35 2002
+++ real/include/asm-ia64/softirq.h	Fri Jun 21 10:44:05 2002
@@ -13,7 +13,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)
 

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Linux-ia64] Re: [Trivial Patch] : (2.5 latest) More __builtin_expect() cleanup in
  2002-06-21  5:51 [Linux-ia64] Re: [Trivial Patch] : (2.5 latest) More __builtin_expect() cleanup in Manik Raina
@ 2002-06-21  6:10 ` Manik Raina
  2002-06-21  6:23 ` Manik Raina
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Manik Raina @ 2002-06-21  6:10 UTC (permalink / raw)
  To: linux-ia64

Manik Raina wrote:
> 
> diff -u -r linux-2.5.22/include/asm-ia64/softirq.h real/include/asm-ia64/softirq.h
> --- linux-2.5.22/include/asm-ia64/softirq.h     Mon Jun 17 08:01:35 2002
> +++ real/include/asm-ia64/softirq.h     Fri Jun 21 10:44:05 2002
> @@ -13,7 +13,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)
> 

	I don't think softirq.h includes linux/compiler.h . Can you please include
	that ?


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Linux-ia64] Re: [Trivial Patch] : (2.5 latest) More __builtin_expect() cleanup in
  2002-06-21  5:51 [Linux-ia64] Re: [Trivial Patch] : (2.5 latest) More __builtin_expect() cleanup in Manik Raina
  2002-06-21  6:10 ` Manik Raina
@ 2002-06-21  6:23 ` Manik Raina
  2002-06-21  7:55 ` [Linux-ia64] Re: [Trivial Patch] : (2.5 latest) More Andreas Schwab
  2002-06-21  8:04 ` [Linux-ia64] Re: [Trivial Patch] : (2.5 latest) Manik Raina
  3 siblings, 0 replies; 5+ messages in thread
From: Manik Raina @ 2002-06-21  6:23 UTC (permalink / raw)
  To: linux-ia64

[-- Attachment #1: Type: text/plain, Size: 1020 bytes --]


	Latest diffs attached ...

Manik Raina wrote:
> 
> Manik Raina wrote:
> >
> > diff -u -r linux-2.5.22/include/asm-ia64/softirq.h real/include/asm-ia64/softirq.h
> > --- linux-2.5.22/include/asm-ia64/softirq.h     Mon Jun 17 08:01:35 2002
> > +++ real/include/asm-ia64/softirq.h     Fri Jun 21 10:44:05 2002
> > @@ -13,7 +13,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)
> >
> 
>         I don't think softirq.h includes linux/compiler.h . Can you please include
>         that ?

[-- Attachment #2: new --]
[-- Type: text/plain, Size: 4045 bytes --]

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 <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/compiler.h>
 
 #include <asm/processor.h>
 
@@ -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 <linux/mm.h>
 #include <linux/threads.h>
+#include <linux/compiler.h>
 
 #include <asm/mmu_context.h>
 #include <asm/processor.h>
@@ -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 <linux/config.h>
 
 #include <linux/percpu.h>
+#include <linux/compiler.h>
 
 #include <asm/ptrace.h>
 #include <asm/kregs.h>
@@ -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 <davidm@hpl.hp.com>
  */
 #include <asm/hardirq.h>
+#include <linux/compiler.h>
 
 #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)
 

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [Linux-ia64] Re: [Trivial Patch] : (2.5 latest) More
  2002-06-21  5:51 [Linux-ia64] Re: [Trivial Patch] : (2.5 latest) More __builtin_expect() cleanup in Manik Raina
  2002-06-21  6:10 ` Manik Raina
  2002-06-21  6:23 ` Manik Raina
@ 2002-06-21  7:55 ` Andreas Schwab
  2002-06-21  8:04 ` [Linux-ia64] Re: [Trivial Patch] : (2.5 latest) Manik Raina
  3 siblings, 0 replies; 5+ messages in thread
From: Andreas Schwab @ 2002-06-21  7:55 UTC (permalink / raw)
  To: linux-ia64

Manik Raina <manik@cisco.com> writes:

|> 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 <linux/config.h>
|>  #include <linux/kernel.h>
|>  #include <linux/sched.h>
|> +#include <linux/compiler.h>
|>  
|>  #include <asm/processor.h>
|>  
|> @@ -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)

This doesn't compile, it lacks a paren.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux AG, Deutschherrnstr. 15-19, D-90429 Nürnberg
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [Linux-ia64] Re: [Trivial Patch] : (2.5 latest)
  2002-06-21  5:51 [Linux-ia64] Re: [Trivial Patch] : (2.5 latest) More __builtin_expect() cleanup in Manik Raina
                   ` (2 preceding siblings ...)
  2002-06-21  7:55 ` [Linux-ia64] Re: [Trivial Patch] : (2.5 latest) More Andreas Schwab
@ 2002-06-21  8:04 ` Manik Raina
  3 siblings, 0 replies; 5+ messages in thread
From: Manik Raina @ 2002-06-21  8:04 UTC (permalink / raw)
  To: linux-ia64

[-- Attachment #1: Type: text/plain, Size: 1114 bytes --]

	
	thanks, new diffs attached 


Andreas Schwab wrote:
> 
> Manik Raina <manik@cisco.com> writes:
> 
> |> 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 <linux/config.h>
> |>  #include <linux/kernel.h>
> |>  #include <linux/sched.h>
> |> +#include <linux/compiler.h>
> |>
> |>  #include <asm/processor.h>
> |>
> |> @@ -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)
> 
> This doesn't compile, it lacks a paren.
> 
> Andreas.
> 
> --
> Andreas Schwab, SuSE Labs, schwab@suse.de
> SuSE Linux AG, Deutschherrnstr. 15-19, D-90429 Nürnberg
> Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
> "And now for something completely different."

[-- Attachment #2: new --]
[-- Type: text/plain, Size: 4046 bytes --]

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 <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/compiler.h>
 
 #include <asm/processor.h>
 
@@ -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 <linux/mm.h>
 #include <linux/threads.h>
+#include <linux/compiler.h>
 
 #include <asm/mmu_context.h>
 #include <asm/processor.h>
@@ -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 <linux/config.h>
 
 #include <linux/percpu.h>
+#include <linux/compiler.h>
 
 #include <asm/ptrace.h>
 #include <asm/kregs.h>
@@ -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 <davidm@hpl.hp.com>
  */
 #include <asm/hardirq.h>
+#include <linux/compiler.h>
 
 #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)
 

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2002-06-21  8:04 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2002-06-21  5:51 [Linux-ia64] Re: [Trivial Patch] : (2.5 latest) More __builtin_expect() cleanup in Manik Raina
2002-06-21  6:10 ` Manik Raina
2002-06-21  6:23 ` Manik Raina
2002-06-21  7:55 ` [Linux-ia64] Re: [Trivial Patch] : (2.5 latest) More Andreas Schwab
2002-06-21  8:04 ` [Linux-ia64] Re: [Trivial Patch] : (2.5 latest) Manik Raina

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox