diff options
| author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2003-10-30 03:17:55 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2003-10-30 03:17:55 +0000 |
| commit | 3c93bc3bae24f955247055f13cb2f03b659a5e4b (patch) | |
| tree | 9157cb5ba0db1971e07eae1efe43b8a91f071af3 | |
| parent | 52a318656dd8f8abdf375c3c9e02ac2b85a8e790 (diff) | |
fix NULL/0 mixup. drahn ok
| -rw-r--r-- | sys/arch/macppc/macppc/machdep.c | 4 | ||||
| -rw-r--r-- | sys/arch/macppc/macppc/ofw_machdep.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/macppc/macppc/machdep.c b/sys/arch/macppc/macppc/machdep.c index eccba1a6b78..2aff9452fbf 100644 --- a/sys/arch/macppc/macppc/machdep.c +++ b/sys/arch/macppc/macppc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.61 2003/10/24 19:56:44 drahn Exp $ */ +/* $OpenBSD: machdep.c,v 1.62 2003/10/30 03:17:54 itojun Exp $ */ /* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */ /* @@ -728,7 +728,7 @@ sendsig(sig_t catcher, int sig, int mask, u_long code, int type, tf->fixreg[1] = (int)fp; tf->lr = (int)catcher; tf->fixreg[3] = (int)sig; - tf->fixreg[4] = (psp->ps_siginfo & sigmask(sig)) ? (int)&fp->sf_si : NULL; + tf->fixreg[4] = (psp->ps_siginfo & sigmask(sig)) ? (int)&fp->sf_si : 0; tf->fixreg[5] = (int)&fp->sf_sc; tf->srr0 = p->p_sigcode; diff --git a/sys/arch/macppc/macppc/ofw_machdep.c b/sys/arch/macppc/macppc/ofw_machdep.c index 0e28996f634..db08255a181 100644 --- a/sys/arch/macppc/macppc/ofw_machdep.c +++ b/sys/arch/macppc/macppc/ofw_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ofw_machdep.c,v 1.22 2003/10/22 20:56:10 drahn Exp $ */ +/* $OpenBSD: ofw_machdep.c,v 1.23 2003/10/30 03:17:54 itojun Exp $ */ /* $NetBSD: ofw_machdep.c,v 1.1 1996/09/30 16:34:50 ws Exp $ */ /* @@ -546,7 +546,7 @@ of_display_console() } } - if (OF_finddevice("/backlight") != NULL) + if (OF_finddevice("/backlight") != 0) cons_backlight_available = 1; memtag = ofw_make_tag(NULL, pcibus(addr[0].phys_hi), |