The patch titled
profile-likely-unlikely-macros-tidy
has been removed from the -mm tree. Its filename is
profile-likely-unlikely-macros-tidy.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
------------------------------------------------------
Subject: profile-likely-unlikely-macros-tidy
From: Andrew Morton <akpm@xxxxxxxx>
Cc: Daniel Walker <dwalker@xxxxxxxxxx>
CC: Hua Zhong <hzhong@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/compiler.h | 30 +++++++++++++--------------
lib/likely_prof.c | 41 +++++++++++++++++++------------------
2 files changed, 37 insertions(+), 34 deletions(-)
diff -puN include/linux/compiler.h~profile-likely-unlikely-macros-tidy include/linux/compiler.h
--- devel/include/linux/compiler.h~profile-likely-unlikely-macros-tidy 2006-05-27 23:29:52.000000000 -0700
+++ devel-akpm/include/linux/compiler.h 2006-05-27 23:29:52.000000000 -0700
@@ -65,22 +65,22 @@ struct likeliness {
extern int do_check_likely(struct likeliness *likeliness, int exp);
-# define LP_UNSEEN 4
+#define LP_UNSEEN 4
-# define __check_likely(exp, is_likely) \
- ({ \
- static __attribute__((__section__(".likely.data"))) \
- struct likeliness likeliness = { \
- .func = __func__, \
- .file = __FILE__, \
- .line = __LINE__, \
- .type = is_likely | LP_UNSEEN, \
- }; \
- do_check_likely(&likeliness, !!(exp)); \
+#define __check_likely(exp, is_likely) \
+ ({ \
+ static __attribute__((__section__(".likely.data"))) \
+ struct likeliness likeliness = { \
+ .func = __func__, \
+ .file = __FILE__, \
+ .line = __LINE__, \
+ .type = is_likely | LP_UNSEEN, \
+ }; \
+ do_check_likely(&likeliness, !!(exp)); \
})
-# define likely(x) __check_likely(x, 1)
-# define unlikely(x) __check_likely(x, 0)
+#define likely(x) __check_likely(x, 1)
+#define unlikely(x) __check_likely(x, 0)
#else
/*
* Generic compiler-dependent macros required for kernel
@@ -88,8 +88,8 @@ extern int do_check_likely(struct likeli
* specific implementations come from the above header files
*/
-# define likely(x) __builtin_expect(!!(x), 1)
-# define unlikely(x) __builtin_expect(!!(x), 0)
+#define likely(x) __builtin_expect(!!(x), 1)
+#define unlikely(x) __builtin_expect(!!(x), 0)
#endif
/* Optimization barrier */
diff -puN lib/likely_prof.c~profile-likely-unlikely-macros-tidy lib/likely_prof.c
--- devel/lib/likely_prof.c~profile-likely-unlikely-macros-tidy 2006-05-27 23:29:52.000000000 -0700
+++ devel-akpm/lib/likely_prof.c 2006-05-27 23:29:52.000000000 -0700
@@ -14,15 +14,16 @@
#include <linux/fs.h>
#include <linux/seq_file.h>
#include <linux/proc_fs.h>
+
#include <asm/bug.h>
#include <asm/atomic.h>
static struct likeliness *likeliness_head;
-volatile unsigned long likely_lock = 0;
-
int do_check_likely(struct likeliness *likeliness, int ret)
{
+ static unsigned long likely_lock;
+
if (ret)
likeliness->count[1]++;
else
@@ -30,13 +31,11 @@ int do_check_likely(struct likeliness *l
if (likeliness->type & LP_UNSEEN) {
/*
- * We don't simple use a spinlock because
- * internally to the spinlock there is a
- * call to unlikely which causes recursion.
- * We opted for this method because we
- * didn't need a preempt/irq disable and it
- * was a bit cleaner then using internal __raw
- * spinlock calls .
+ * We don't simple use a spinlock because internally to the
+ * spinlock there is a call to unlikely which causes recursion.
+ * We opted for this method because we didn't need a preempt/irq
+ * disable and it was a bit cleaner then using internal __raw
+ * spinlock calls.
*/
if (!test_and_set_bit(0, &likely_lock)) {
if (likeliness->type & LP_UNSEEN) {
@@ -58,8 +57,10 @@ static void * lp_seq_start(struct seq_fi
if (!*pos) {
seq_printf(out, "Likely Profiling Results\n");
- seq_printf(out, " --------------------------------------------------------------------\n");
- seq_printf(out, "[+- ] Type | # True | # False | Function:Filename@Line\n");
+ seq_printf(out, " --------------------------------------------"
+ "------------------------\n");
+ seq_printf(out, "[+- ] Type | # True | # False | Function:"
+ "Filename@Line\n");
out->private = likeliness_head;
}
@@ -67,9 +68,9 @@ static void * lp_seq_start(struct seq_fi
return out->private;
}
-static void * lp_seq_next(struct seq_file *out, void *p, loff_t *pos)
+static void *lp_seq_next(struct seq_file *out, void *p, loff_t *pos)
{
- struct likeliness * entry = p;
+ struct likeliness *entry = p;
if (entry->next) {
++(*pos);
@@ -77,13 +78,14 @@ static void * lp_seq_next(struct seq_fil
} else
out->private = NULL;
- return (out->private);
+ return out->private;
}
static int lp_seq_show(struct seq_file *out, void *p)
{
- struct likeliness * entry = p;
- int true = entry->count[1], false = entry->count[0];
+ struct likeliness *entry = p;
+ int true = entry->count[1];
+ int false = entry->count[0];
if (!entry->type) {
if (true > false)
@@ -92,8 +94,7 @@ static int lp_seq_show(struct seq_file *
seq_printf(out, " ");
seq_printf(out, "unlikely ");
- }
- else {
+ } else {
if (true < false)
seq_printf(out, "-");
else
@@ -108,7 +109,9 @@ static int lp_seq_show(struct seq_file *
return 0;
}
-static void lp_seq_stop(struct seq_file *m, void *p) { }
+static void lp_seq_stop(struct seq_file *m, void *p)
+{
+}
struct seq_operations likely_profiling_ops = {
.start = lp_seq_start,
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
ext3-resize-fix-double-unlock_super.patch
tpm-more-bios-log-parsing-fixes-tidy.patch
revert-swsusp-add-check-for-suspension-of-x-controlled-devices.patch
net-compath-build-fix.patch
git-acpi.patch
acpi-update-asus_acpi-driver-registration-fix.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driver-register-start-func-for-memory-device.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driveravoid-redundant-call-add_memory.patch
acpi-dock-driver-interface-fixups.patch
acpi-atlas-acpi-driver-v2-tidy.patch
remove-for_each_cpu.patch
sony_apci-resume.patch
uninorth-agp-warning-fixes.patch
alpha-agp-warning-fix.patch
kauditd_thread-warning-fix.patch
powernow-k8-crash-workaround.patch
git-dvb.patch
scx200_acb-use-pci-i-o-resource-when-appropriate-fix.patch
git-gfs2.patch
ieee1394_core-switch-to-kthread-api-fix.patch
git-infiniband.patch
via-pmu-add-input-device-tidy.patch
git-intelfb.patch
git-klibc.patch
git-hdrcleanup-fixup.patch
git-hdrcleanup-vs-git-klibc-on-ia64.patch
git-hdrcleanup-vs-git-klibc-on-ia64-2.patch
git-hdrinstall-fixup.patch
git-libata-all.patch
libata-reduce-timeouts.patch
sdhci-truncated-pointer-fix.patch
git-mtd.patch
git-mtd-fixup.patch
git-mtd-cs553x_nand-build-fix.patch
git-mtd-ya-build-fix.patch
git-netdev-all.patch
git-netdev-all-fixup.patch
smc911x-Kconfig-fix.patch
pci-error-recovery-e1000-network-device-driver.patch
git-net.patch
git-net-git-klibc-fixup.patch
git-nfs-fixup.patch
git-powerpc.patch
powerpc-kbuild-warning-fix.patch
git-rbtree.patch
git-sas.patch
gregkh-pci-pci-64-bit-resources-drivers-others-changes-amba-fix.patch
kconfigurable-resources-core-changes-i386-fix.patch
kconfigurable-resources-core-changes-fix.patch
kconfigurable-resources-arch-dependent-changes-arch-a-i-fix.patch
typesh-sector_t-and-blkcnt_t-arent-for-userspace.patch
kconfigurable-resources-mtd-fixes.patch
bogus-disk-geometry-on-large-disks-warning-fix.patch
megaraid_sas-add-support-for-zcr-controller-fix.patch
areca-raid-linux-scsi-driver-update6-for-2617-rc1-mm3-externs-go-in-headers.patch
git-scsi-target-fixup.patch
git-scsi-target-warning-fix.patch
revert-gregkh-usb-usb-ohci-avoids-root-hub-timer-polling.patch
gregkh-usb-usb-serial-mos7720-powerpc-wrokaround.patch
driver-for-apple-cinema-display-tweaks.patch
git-supertrak-fixup.patch
x86_64-mm-reliable-stack-trace-support-non-x86-fix.patch
x86_64-mm-reliable-stack-trace-support-non-x86-fix-fix.patch
x86_64-mm-moving-phys_proc_id-and-cpu_core_id-to-cpuinfo_x86-warning-fix.patch
x86_64-dont-warn-for-overflow-in-nommu-case-when-dma_mask-is-32bit-fix.patch
xfs-sparc32-build-fix.patch
pg_uncached-is-ia64-only.patch
fix-update_mmu_cache-in-fremapc-fix.patch
page-migration-simplify-migrate_pages-tweaks.patch
page-migration-support-moving-of-individual-pages-x86-support-fix.patch
acx1xx-wireless-driver.patch
tiacx-pci-build-fix.patch
x86-kernel-irq-balancer-fix-tidy.patch
i386-moving-phys_proc_id-and-cpu_core_id-to-cpuinfo_x86-warning-fix.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-tidy.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-arch_vma_name-fix.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-vs-x86_64-mm-reliable-stack-trace-support-i386.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-vs-x86_64-mm-reliable-stack-trace-support-i386-2.patch
prune_one_dentry-tweaks.patch
mmput-might-sleep.patch
jbd-avoid-kfree-null.patch
ext3_clear_inode-avoid-kfree-null.patch
leds-amstrad-delta-led-support-tidy.patch
connector-exports.patch
config_net=n-build-fix.patch
rewritten-backlight-infrastructure-for-portable-apple-computers-fix.patch
allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-fix.patch
allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-tidy.patch
deprecate-smbfs-in-favour-of-cifs.patch
msnd-section-fix.patch
openpromfs-factorize-out-tidy.patch
add-export_unused_symbol-and-export_unused_symbol_gpl-default.patch
kernel-sysc-cleanups-fix.patch
cpqarray-section-fix.patch
pdflush-handle-resume-wakeups.patch
schedule_on_each_cpu-reduce-kmalloc-size.patch
ax88796-parallel-port-driver-build-fix.patch
keys-fix-race-between-two-instantiators-of-a-key-tidy.patch
inotify-kernel-api-fix.patch
for_each_cpu_mask-warning-fix.patch
add-max6902-rtc-support-tidy.patch
per-task-delay-accounting-proc-export-of-aggregated-block-i-o-delays-warning-fix.patch
add-via-hw-rng-driver-fix.patch
hangcheck-remove-monotomic_clock-on-x86.patch
swap-prefetch-fix-lru_cache_add_tail-tidy.patch
mark-address_space_operations-const-vs-ecryptfs-mmap-operations.patch
ecryptfs-alpha-build-fix.patch
namespaces-add-nsproxy-dont-include-compileh.patch
namespaces-utsname-switch-to-using-uts-namespaces-alpha-fix.patch
namespaces-utsname-implement-utsname-namespaces-export.patch
namespaces-utsname-implement-utsname-namespaces-dont-include-compileh.patch
readahead-sysctl-parameters-fix.patch
make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch
reiser4-run-truncate_inode_pages-in-reiser4_delete_inode.patch
ide_dma_speed-fixes-warning-fix.patch
ide_dma_speed-fixes-tidy.patch
hpt3xx-rework-rate-filtering-tidy.patch
savagefb-add-state-save-and_restore-hooks-tidy.patch
au1100fb-add-power-management-support-tidy.patch
lib-add-idr_replace-tidy.patch
genirq-rename-desc-handler-to-desc-chip-power-fix.patch
genirq-rename-desc-handler-to-desc-chip-ia64-fix.patch
genirq-rename-desc-handler-to-desc-chip-ia64-fix-2.patch
genirq-convert-the-i386-architecture-to-irq-chips-fix-2.patch
lock-validator-beautify-x86_64-stacktraces-fix.patch
lock-validator-stacktrace-build-fix.patch
lock-validator-stacktrace-warning-fix.patch
lock-validator-irqtrace-core-powerpc-fix-1.patch
lock-validator-irqtrace-core-non-x86-fix.patch
lock-validator-irqtrace-core-non-x86-fix-2.patch
lock-validator-irqtrace-core-non-x86-fix-3.patch
lock-validator-add-per_cpu_offset-fix.patch
lock-validator-core-multichar-fix.patch
lock-validator-prove-rwsem-locking-correctness-fix.patch
lock-validator-prove-rwsem-locking-correctness-powerpc-fix.patch
lock-validator-special-locking-serial-fix.patch
lock-validator-special-locking-sb-s_umount-fix.patch
lock-validator-enable-lock-validator-in-kconfig-not-yet.patch
kgdb-core-lite-add-reboot-command.patch
kgdb-8250-fix.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
revert-tty-buffering-comment-out-debug-code.patch
slab-leaks3-default-y.patch
x86-kmap_atomic-debugging.patch
profile-likely-unlikely-macros.patch
profile-likely-unlikely-macros-tidy.patch
profile-likely-unlikely-macros-fix.patch
profile-likely-unlikely-macros-fix-2.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
