| Message ID | 20200523202650.3063421-1-mattst88@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | None | expand |
From: Matt Turner <mattst88@gmail.com> Date: Sat, 23 May 2020 13:26:50 -0700 > Note that this does change the behavior of the code. After the patch > only < 2.6 PROMs will fail (which is probably correct), instead of every > 2.* like now. > > Signed-off-by: Matt Turner <mattst88@gmail.com> Applied.
diff --git a/second/disk.c b/second/disk.c index 40234b3..b81a465 100644 --- a/second/disk.c +++ b/second/disk.c @@ -293,7 +293,7 @@ int silo_disk_read(char *buff, int size, unsigned long long offset) if (!net) { if (prom_vers != PROM_P1275) { if (((romvec->pv_printrev >> 16) < 2 || - ((romvec->pv_printrev >> 16) == 2 && (romvec->pv_printrev && 0xffff) < 6)) + ((romvec->pv_printrev >> 16) == 2 && (romvec->pv_printrev & 0xffff) < 6)) && offset >= 0x40000000) { printf ("Buggy old PROMs don't allow reading past 1GB from start of the disk. Send complaints to SMCC\n"); return -1;
Note that this does change the behavior of the code. After the patch only < 2.6 PROMs will fail (which is probably correct), instead of every 2.* like now. Signed-off-by: Matt Turner <mattst88@gmail.com> --- second/disk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)