The patch titled
drivers/char/hw_random.c: remove assert()'s
has been added to the -mm tree. Its filename is
drivers-char-hw_randomc-remove-asserts.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: Adrian Bunk <bunk@xxxxxxxxx>
Remove the assert()'s from drivers/char/hw_random.c since you both needed
to enable a manual option in the driver source to make them effective and
they only covered some obviously impossible cases.
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/char/hw_random.c | 21 ---------------------
1 files changed, 21 deletions(-)
diff -puN drivers/char/hw_random.c~drivers-char-hw_randomc-remove-asserts drivers/char/hw_random.c
--- 25/drivers/char/hw_random.c~drivers-char-hw_randomc-remove-asserts Mon May 8 12:03:00 2006
+++ 25-akpm/drivers/char/hw_random.c Mon May 8 12:03:00 2006
@@ -66,17 +66,6 @@
#define DPRINTK(fmt, args...) pr_debug(PFX "%s: " fmt, __FUNCTION__ , ## args)
-#undef RNG_NDEBUG /* define to enable lightweight runtime checks */
-#ifdef RNG_NDEBUG
-#define assert(expr) \
- if(!(expr)) { \
- printk(KERN_DEBUG PFX "Assertion failed! %s,%s,%s," \
- "line=%d\n", #expr, __FILE__, __FUNCTION__, __LINE__); \
- }
-#else
-#define assert(expr)
-#endif
-
#define RNG_MISCDEV_MINOR 183 /* official */
static int rng_dev_open (struct inode *inode, struct file *filp);
@@ -211,29 +200,23 @@ static void __iomem *rng_mem;
static inline u8 intel_hwstatus (void)
{
- assert (rng_mem != NULL);
return readb (rng_mem + INTEL_RNG_HW_STATUS);
}
static inline u8 intel_hwstatus_set (u8 hw_status)
{
- assert (rng_mem != NULL);
writeb (hw_status, rng_mem + INTEL_RNG_HW_STATUS);
return intel_hwstatus ();
}
static unsigned int intel_data_present(void)
{
- assert (rng_mem != NULL);
-
return (readb (rng_mem + INTEL_RNG_STATUS) & INTEL_RNG_DATA_PRESENT) ?
1 : 0;
}
static u32 intel_data_read(void)
{
- assert (rng_mem != NULL);
-
return readb (rng_mem + INTEL_RNG_DATA);
}
@@ -495,7 +478,6 @@ static u32 geode_data_read(void)
{
u32 val;
- assert(geode_rng_base != NULL);
val = readl(geode_rng_base + GEODE_RNG_DATA_REG);
return val;
}
@@ -504,7 +486,6 @@ static unsigned int geode_data_present(v
{
u32 val;
- assert(geode_rng_base != NULL);
val = readl(geode_rng_base + GEODE_RNG_STATUS_REG);
return val;
}
@@ -605,8 +586,6 @@ static int __init rng_init_one (struct p
DPRINTK ("ENTER\n");
- assert(rng_ops != NULL);
-
rc = rng_ops->init(dev);
if (rc)
goto err_out;
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
origin.patch
git-acpi.patch
acpiphp-use-new-dock-driver-fix.patch
git-dvb.patch
git-gfs2.patch
git-intelfb.patch
drivers-char-hw_randomc-remove-asserts.patch
git-nfs.patch
git-ocfs2.patch
gregkh-pci-acpiphp-configure-_prt-v3-cleanup.patch
git-scsi-rc-fixes.patch
drivers-scsi-aic7xxx-possible-cleanups.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-megaraidc-add-a-dummy-mega_create_proc_entry-for-proc_fs=y.patch
drivers-scsi-gdthc-make-__gdth_execute-static.patch
drivers-scsi-qla2xxx-make-some-functions-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_done_with_status-static.patch
remove-drivers-scsi-constantscscsi_print_req_sense.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
drivers-scsi-aic7xxx-possible-cleanups-2.patch
ieee80211_wxc-remove-dead-code.patch
swsusp-rework-memory-shrinker-rev-2-fix.patch
acx1xx-wireless-driver.patch
arch-i386-kernel-apicc-make-modern_apic-static.patch
kernel-power-snapshotc-cleanups.patch
remove-fs-jffs2-ioctlc.patch
fs-locksc-make-posix_locks_deadlock-static.patch
remove-config_parport_arc-drivers-parport-parport_arcc.patch
fs-fat-miscc-unexport-fat_sync_bhs.patch
the-scheduled-unexport-of-insert_resource.patch
time-i386-clocksource-drivers.patch
reiser4.patch
fs-reiser4-misc-cleanups.patch
fbdev-cleanup-the-config_video_select-mess.patch
fbdev-remove-duplicate-includes.patch
md-make-md_print_devices-static.patch
nmi-lockup-and-altsysrq-p-dumping-calltraces-on-_all_-cpus.patch
slab-cache-shrinker-statistics.patch
i386-enable-4k-stacks-by-default.patch
mutex-subsystem-synchro-test-module.patch
drivers-char-ipmi-ipmi_msghandlerc-make-proc_ipmi_root-static.patch
drivers-message-i2o-iopc-unexport-i2o_msg_nop.patch
x86_64-unexport-ia32_sys_call_table.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
