From: mita@miraclelinux.com (Akinobu Mita)
To: linux-kernel@vger.kernel.org
Cc: Richard Henderson <rth@twiddle.net>,
Ivan Kokshaysky <ink@jurassic.park.msu.ru>,
Russell King <rmk@arm.linux.org.uk>, Ian Molton <spyro@f2s.com>,
dev-etrax@axis.com, David Howells <dhowells@redhat.com>,
Yoshinori Sato <ysato@users.sourceforge.jp>,
Linus Torvalds <torvalds@osdl.org>,
linux-ia64@vger.kernel.org,
Hirokazu Takata <takata@linux-m32r.org>,
linux-m68k@vger.kernel.org, Greg Ungerer <gerg@uclinux.org>,
linux-mips@linux-mips.org, parisc-linux@parisc-linux.org,
linuxppc-dev@ozlabs.org, linux390@de.ibm.com,
linuxsh-dev@lists.sourceforge.net,
linuxsh-shmedia-dev@lists.sourceforge.net,
sparclinux@vger.kernel.org, ultralinux@vger.kernel.org,
Miles Bader <uclinux-v850@lsi.nec.co.jp>, Andi Kleen <ak@suse.de>,
Chris Zankel <chris@zankel.net>
Subject: [PATCH 1/6] {set,clear,test}_bit() related cleanup
Date: Wed, 25 Jan 2006 20:28:57 +0900 [thread overview]
Message-ID: <20060125112857.GB18584@miraclelinux.com> (raw)
In-Reply-To: <20060125112625.GA18584@miraclelinux.com>
While working on these patch set, I found several possible cleanup
on x86-64 and ia64.
Signed-off-by: Akinobu Mita <mita@miraclelinux.com>
---
arch/ia64/kernel/mca.c | 3 ++-
arch/x86_64/kernel/mce.c | 3 +--
arch/x86_64/kernel/setup.c | 3 +--
arch/x86_64/pci/mmconfig.c | 4 ++--
include/asm-x86_64/mmu_context.h | 6 +++---
include/asm-x86_64/pgtable.h | 6 +++---
6 files changed, 12 insertions(+), 13 deletions(-)
Index: 2.6-git/arch/x86_64/kernel/mce.c
===================================================================
--- 2.6-git.orig/arch/x86_64/kernel/mce.c 2006-01-25 19:07:15.000000000 +0900
+++ 2.6-git/arch/x86_64/kernel/mce.c 2006-01-25 19:13:59.000000000 +0900
@@ -139,8 +139,7 @@
static int mce_available(struct cpuinfo_x86 *c)
{
- return test_bit(X86_FEATURE_MCE, &c->x86_capability) &&
- test_bit(X86_FEATURE_MCA, &c->x86_capability);
+ return cpu_has(c, X86_FEATURE_MCE) && cpu_has(c, X86_FEATURE_MCA);
}
static inline void mce_get_rip(struct mce *m, struct pt_regs *regs)
Index: 2.6-git/arch/x86_64/kernel/setup.c
===================================================================
--- 2.6-git.orig/arch/x86_64/kernel/setup.c 2006-01-25 19:07:15.000000000 +0900
+++ 2.6-git/arch/x86_64/kernel/setup.c 2006-01-25 19:13:59.000000000 +0900
@@ -1334,8 +1334,7 @@
{
int i;
for ( i = 0 ; i < 32*NCAPINTS ; i++ )
- if ( test_bit(i, &c->x86_capability) &&
- x86_cap_flags[i] != NULL )
+ if (cpu_has(c, i) && x86_cap_flags[i] != NULL )
seq_printf(m, " %s", x86_cap_flags[i]);
}
Index: 2.6-git/include/asm-x86_64/mmu_context.h
===================================================================
--- 2.6-git.orig/include/asm-x86_64/mmu_context.h 2006-01-25 19:07:15.000000000 +0900
+++ 2.6-git/include/asm-x86_64/mmu_context.h 2006-01-25 19:13:59.000000000 +0900
@@ -34,12 +34,12 @@
unsigned cpu = smp_processor_id();
if (likely(prev != next)) {
/* stop flush ipis for the previous mm */
- clear_bit(cpu, &prev->cpu_vm_mask);
+ cpu_clear(cpu, prev->cpu_vm_mask);
#ifdef CONFIG_SMP
write_pda(mmu_state, TLBSTATE_OK);
write_pda(active_mm, next);
#endif
- set_bit(cpu, &next->cpu_vm_mask);
+ cpu_set(cpu, next->cpu_vm_mask);
load_cr3(next->pgd);
if (unlikely(next->context.ldt != prev->context.ldt))
@@ -50,7 +50,7 @@
write_pda(mmu_state, TLBSTATE_OK);
if (read_pda(active_mm) != next)
out_of_line_bug();
- if(!test_and_set_bit(cpu, &next->cpu_vm_mask)) {
+ if(!cpu_test_and_set(cpu, next->cpu_vm_mask)) {
/* We were in lazy tlb mode and leave_mm disabled
* tlb flush IPI delivery. We must reload CR3
* to make sure to use no freed page tables.
Index: 2.6-git/arch/x86_64/pci/mmconfig.c
===================================================================
--- 2.6-git.orig/arch/x86_64/pci/mmconfig.c 2006-01-25 19:07:15.000000000 +0900
+++ 2.6-git/arch/x86_64/pci/mmconfig.c 2006-01-25 19:13:59.000000000 +0900
@@ -46,7 +46,7 @@
static char __iomem *pci_dev_base(unsigned int seg, unsigned int bus, unsigned int devfn)
{
char __iomem *addr;
- if (seg == 0 && bus == 0 && test_bit(PCI_SLOT(devfn), &fallback_slots))
+ if (seg == 0 && bus == 0 && test_bit(PCI_SLOT(devfn), fallback_slots))
return NULL;
addr = get_virt(seg, bus);
if (!addr)
@@ -134,7 +134,7 @@
continue;
addr = pci_dev_base(0, 0, PCI_DEVFN(i, 0));
if (addr == NULL|| readl(addr) != val1) {
- set_bit(i, &fallback_slots);
+ set_bit(i, fallback_slots);
}
}
}
Index: 2.6-git/include/asm-x86_64/pgtable.h
===================================================================
--- 2.6-git.orig/include/asm-x86_64/pgtable.h 2006-01-25 19:07:15.000000000 +0900
+++ 2.6-git/include/asm-x86_64/pgtable.h 2006-01-25 19:13:59.000000000 +0900
@@ -293,19 +293,19 @@
{
if (!pte_dirty(*ptep))
return 0;
- return test_and_clear_bit(_PAGE_BIT_DIRTY, ptep);
+ return test_and_clear_bit(_PAGE_BIT_DIRTY, &ptep->pte);
}
static inline int ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)
{
if (!pte_young(*ptep))
return 0;
- return test_and_clear_bit(_PAGE_BIT_ACCESSED, ptep);
+ return test_and_clear_bit(_PAGE_BIT_ACCESSED, &ptep->pte);
}
static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
{
- clear_bit(_PAGE_BIT_RW, ptep);
+ clear_bit(_PAGE_BIT_RW, &ptep->pte);
}
/*
Index: 2.6-git/arch/ia64/kernel/mca.c
===================================================================
--- 2.6-git.orig/arch/ia64/kernel/mca.c 2006-01-25 19:07:14.000000000 +0900
+++ 2.6-git/arch/ia64/kernel/mca.c 2006-01-25 19:14:01.000000000 +0900
@@ -69,6 +69,7 @@
#include <linux/kernel.h>
#include <linux/smp.h>
#include <linux/workqueue.h>
+#include <linux/cpumask.h>
#include <asm/delay.h>
#include <asm/kdebug.h>
@@ -1430,7 +1431,7 @@
ti->cpu = cpu;
p->thread_info = ti;
p->state = TASK_UNINTERRUPTIBLE;
- __set_bit(cpu, &p->cpus_allowed);
+ cpu_set(cpu, p->cpus_allowed);
INIT_LIST_HEAD(&p->tasks);
p->parent = p->real_parent = p->group_leader = p;
INIT_LIST_HEAD(&p->children);
next prev parent reply other threads:[~2006-01-25 11:28 UTC|newest]
Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-25 11:26 [PATCH 0/6] RFC: use include/asm-generic/bitops.h Akinobu Mita
2006-01-25 11:28 ` Akinobu Mita [this message]
2006-01-25 11:46 ` [PATCH 1/6] {set,clear,test}_bit() related cleanup Andi Kleen
2006-01-26 16:14 ` Pavel Machek
2006-01-26 16:47 ` Russell King
2006-01-26 19:14 ` Paul Jackson
2006-01-25 11:30 ` [PATCH 2/6] use non atomic operations for minix_*_bit() and ext2_*_bit() Akinobu Mita
2006-01-25 11:32 ` [PATCH 3/6] C-language equivalents of include/asm-*/bitops.h Akinobu Mita
2006-01-25 11:54 ` Keith Owens
2006-01-26 2:13 ` Akinobu Mita
2006-01-26 2:19 ` Akinobu Mita
2006-01-25 20:02 ` Russell King
2006-01-25 20:59 ` Grant Grundler
2006-01-26 3:27 ` Akinobu Mita
2006-01-26 3:29 ` [PATCH 1/12] generic *_bit() Akinobu Mita
2006-02-01 15:11 ` Chen, Kenneth W
2006-02-01 18:02 ` Christoph Hellwig
2006-02-01 18:07 ` Chen, Kenneth W
2006-02-01 19:19 ` Russell King
2006-02-01 19:25 ` Chen, Kenneth W
2006-02-01 19:35 ` Russell King
2006-02-03 10:24 ` Geert Uytterhoeven
2006-02-03 10:27 ` Russell King
2006-02-01 19:39 ` Grant Grundler
2006-02-01 21:41 ` Chen, Kenneth W
2006-02-01 22:09 ` Grant Grundler
2006-02-01 22:49 ` Anton Altaparmakov
2006-02-02 0:08 ` Grant Grundler
2006-02-02 8:52 ` Anton Altaparmakov
2006-02-02 10:13 ` Andreas Schwab
2006-02-02 22:43 ` Paul Mackerras
2006-01-26 3:30 ` [PATCH 2/12] generic __ffs() Akinobu Mita
2006-01-26 3:31 ` [PATCH 3/12] generic ffz() Akinobu Mita
2006-01-26 8:21 ` Michael Tokarev
2006-01-27 6:39 ` [PATCH] parisc: add ()-pair in __ffs() Akinobu Mita
2006-01-26 3:32 ` [PATCH 4/12] generic fls() and fls64() Akinobu Mita
2006-01-26 3:33 ` [PATCH 5/12] generic find_{next,first}{,_zero}_bit() Akinobu Mita
2006-01-26 3:34 ` [PATCH 6/12] generic sched_find_first_bit() Akinobu Mita
2006-01-26 3:35 ` [PATCH 7/12] generic ffs() Akinobu Mita
2006-01-26 3:36 ` [PATCH 8/12] generic hweight{32,16,8}() Akinobu Mita
2006-01-26 7:12 ` Balbir Singh
2006-01-26 10:04 ` Rutger Nijlunsing
2006-01-27 4:55 ` Akinobu Mita
2006-01-27 5:40 ` Balbir Singh
2006-01-27 6:40 ` Akinobu Mita
2006-01-31 11:14 ` Balbir Singh
2006-01-26 18:57 ` Bryan O'Sullivan
2006-01-27 4:43 ` Akinobu Mita
2006-01-27 5:23 ` Bryan O'Sullivan
2006-01-26 3:36 ` [PATCH 9/12] generic hweight64() Akinobu Mita
2006-01-26 7:05 ` Balbir Singh
2006-01-26 3:38 ` [PATCH 10/12] generic ext2_{set,clear,test,find_first_zero,find_next_zero}_bit() Akinobu Mita
2006-01-26 3:38 ` [PATCH 11/12] generic ext2_{set,clear}_bit_atomic() Akinobu Mita
2006-01-26 3:39 ` [PATCH 12/12] generic minix_{test,set,test_and_clear,test,find_first_zero}_bit() Akinobu Mita
2006-01-25 23:25 ` [PATCH 3/6] C-language equivalents of include/asm-*/bitops.h Ian Molton
2006-01-26 0:06 ` Richard Henderson
2006-01-26 4:34 ` Edgar Toernig
2006-01-26 17:30 ` Richard Henderson
2006-01-26 8:55 ` Russell King
2006-01-26 16:18 ` [parisc-linux] " Grant Grundler
2006-01-26 16:30 ` Nicolas Pitre
2006-01-26 16:40 ` Russell King
2006-01-26 23:04 ` Grant Grundler
2006-01-26 23:03 ` Russell King
2006-01-29 7:12 ` Stuart Brady
2006-01-30 4:03 ` David S. Miller
2006-01-30 17:06 ` Ralf Baechle
2006-01-30 19:50 ` Stuart Brady
2006-01-30 23:02 ` David S. Miller
2006-01-27 0:28 ` [parisc-linux] Re: [PATCH 3/6] C-language equivalents of John David Anglin
2006-01-27 12:51 ` [PATCH 3/6] C-language equivalents of include/asm-*/bitops.h Hirokazu Takata
2006-01-30 3:29 ` Akinobu Mita
2006-01-25 11:34 ` [PATCH 5/6] fix warning on test_ti_thread_flag() Akinobu Mita
2006-01-25 12:28 ` Geert Uytterhoeven
2006-01-25 22:28 ` Paul Mackerras
2006-01-26 0:04 ` David S. Miller
2006-01-25 11:35 ` [PATCH 6/6] remove unused generic bitops in include/linux/bitops.h Akinobu Mita
[not found] ` <20060125113336.GE18584@miraclelinux.com>
2006-01-26 1:49 ` [PATCH 4/6] use include/asm-generic/bitops for each architecture Akinobu Mita
2006-01-26 2:37 ` Grant Grundler
2006-01-27 13:04 ` Hirokazu Takata
2006-01-30 3:15 ` Akinobu Mita
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060125112857.GB18584@miraclelinux.com \
--to=mita@miraclelinux.com \
--cc=ak@suse.de \
--cc=chris@zankel.net \
--cc=dev-etrax@axis.com \
--cc=dhowells@redhat.com \
--cc=gerg@uclinux.org \
--cc=ink@jurassic.park.msu.ru \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux390@de.ibm.com \
--cc=linuxppc-dev@ozlabs.org \
--cc=linuxsh-dev@lists.sourceforge.net \
--cc=linuxsh-shmedia-dev@lists.sourceforge.net \
--cc=parisc-linux@parisc-linux.org \
--cc=rmk@arm.linux.org.uk \
--cc=rth@twiddle.net \
--cc=sparclinux@vger.kernel.org \
--cc=spyro@f2s.com \
--cc=takata@linux-m32r.org \
--cc=torvalds@osdl.org \
--cc=uclinux-v850@lsi.nec.co.jp \
--cc=ultralinux@vger.kernel.org \
--cc=ysato@users.sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).