lkml.org 
[lkml]   [1998]   [Jul]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: Linux-2.1.109.. preliminary code freeze.
    On Thu, Jul 16, 1998 at 05:41:26PM -0700, Linus Torvalds wrote:
    >
    > Ok, it's out there now in all its glory...
    >
    > 2.1.109 does the following thing:
    [...]
    > - console updates, so now we have the full old functionality again as far
    > as I'm concerned (but I'm sure people will tell me something is still
    > missing)

    TGA framebuffer will not even compile.

    > - de4x5 driver update

    2.1.109 dies immedeately after ifconfig with "Aiee, killing interrupt
    handler". Reason appears to be a "bad unaligned kernel access" in
    de4x5_interrupt(). Sorry for not being more specific, but ksymoops can't
    decode an alpha OOPS!

    > The same goes for patches in email. I will accept patches, but I've just
    > raised the bar for acception.

    Ok. The following patch does:

    * Reverts some changes to alpha_ksyms.c to get the kernel to link at all.
    * Fixes SMP compilation on Alpha (Tested on UDB).
    * Fixes TGA framebuffer (Tested on UDB).
    * Fixes a 32bit Integer to 64bit pointer cast in AD1848 driver (Tested on UDB).

    Yours,
    Dominik Kubla

    BTW: 2.1.109-ac1 won't even get to ifconfig because it gets stuck in
    kernel/fork.c right after the message "copy_files: pid 4 , open files 64
    exceeds max 32!", so it looks as if some patch in Alan's bunch is not
    64bit clean... I suspect the large file arrays patch.
    diff -urN linux-2.1.109/arch/alpha/kernel/alpha_ksyms.c linux/arch/alpha/kernel/alpha_ksyms.c
    --- linux-2.1.109/arch/alpha/kernel/alpha_ksyms.c Fri Jul 17 19:09:42 1998
    +++ linux/arch/alpha/kernel/alpha_ksyms.c Fri Jul 17 20:14:34 1998
    @@ -64,7 +64,7 @@
    EXPORT_SYMBOL(_writel);
    EXPORT_SYMBOL(_memcpy_fromio);
    EXPORT_SYMBOL(_memcpy_toio);
    -EXPORT_SYMBOL(_memset_c_io);
    +EXPORT_SYMBOL(_memset_io);
    EXPORT_SYMBOL(insb);
    EXPORT_SYMBOL(insw);
    EXPORT_SYMBOL(insl);
    @@ -87,7 +87,6 @@
    EXPORT_SYMBOL(memmove);
    EXPORT_SYMBOL(__memcpy);
    EXPORT_SYMBOL(__memset);
    -EXPORT_SYMBOL(__memsetw);
    EXPORT_SYMBOL(__constant_c_memset);

    EXPORT_SYMBOL(dump_thread);
    diff -urN linux-2.1.109/arch/alpha/kernel/lca.c linux/arch/alpha/kernel/lca.c
    --- linux-2.1.109/arch/alpha/kernel/lca.c Fri Jul 17 19:09:13 1998
    +++ linux/arch/alpha/kernel/lca.c Fri Jul 17 20:20:23 1998
    @@ -13,6 +13,7 @@
    #include <asm/ptrace.h>
    #include <asm/system.h>
    #include <asm/io.h>
    +#include <asm/smp.h>

    /*
    * BIOS32-style PCI interface:
    diff -urN linux-2.1.109/arch/alpha/kernel/smc37c669.c linux/arch/alpha/kernel/smc37c669.c
    --- linux-2.1.109/arch/alpha/kernel/smc37c669.c Fri Jul 17 19:09:14 1998
    +++ linux/arch/alpha/kernel/smc37c669.c Fri Jul 17 20:21:04 1998
    @@ -6,6 +6,7 @@
    #include <linux/malloc.h>
    #include <linux/mm.h>
    #include <linux/init.h>
    +#include <linux/delay.h>

    #include <asm/hwrpb.h>
    #include <asm/io.h>
    diff -urN linux-2.1.109/arch/alpha/kernel/smp.c linux/arch/alpha/kernel/smp.c
    --- linux-2.1.109/arch/alpha/kernel/smp.c Fri Jul 17 19:09:14 1998
    +++ linux/arch/alpha/kernel/smp.c Fri Jul 17 20:20:42 1998
    @@ -9,6 +9,7 @@
    #include <linux/smp_lock.h>
    #include <linux/interrupt.h>
    #include <linux/init.h>
    +#include <linux/delay.h>

    #include <asm/hwrpb.h>
    #include <asm/ptrace.h>
    diff -urN linux-2.1.109/drivers/sound/ad1848.c linux/drivers/sound/ad1848.c
    --- linux-2.1.109/drivers/sound/ad1848.c Fri Jul 17 19:09:46 1998
    +++ linux/drivers/sound/ad1848.c Fri Jul 17 22:43:01 1998
    @@ -1721,7 +1721,7 @@
    */


    - int my_dev;
    + long my_dev;
    char dev_name[100];
    int e;

    @@ -1951,12 +1951,12 @@
    {
    unsigned char status;
    ad1848_info *devc;
    - int dev;
    + long dev;
    int alt_stat = 0xff;
    unsigned char c930_stat = 0;
    int cnt = 0;

    - dev = (int)dev_id;
    + dev = (long)dev_id;
    devc = (ad1848_info *) audio_devs[dev]->devc;

    interrupt_again: /* Jump back here if int status doesn't reset */
    diff -urN linux-2.1.109/drivers/video/tgafb.c linux/drivers/video/tgafb.c
    --- linux-2.1.109/drivers/video/tgafb.c Fri Jul 17 19:09:50 1998
    +++ linux/drivers/video/tgafb.c Fri Jul 17 20:27:10 1998
    @@ -40,6 +40,7 @@
    #include <linux/selection.h>
    #include <asm/io.h>

    +#include "fbcon.h"
    #include "fbcon-cfb8.h"
    #include "fbcon-cfb32.h"

    @@ -743,12 +744,14 @@
    #ifdef CONFIG_FBCON_CFB8
    case 0: /* 8-plane */
    disp.dispsw = &fbcon_cfb8;
    + disp.scrollmode = SCROLL_YREDRAW;
    break;
    #endif
    #ifdef CONFIG_FBCON_CFB32
    case 1: /* 24-plane */
    case 3: /* 24plusZ */
    disp.dispsw = &fbcon_cfb32;
    + disp.scrollmode = SCROLL_YREDRAW;
    break;
    #endif
    default:
    diff -urN linux-2.1.109/include/asm-alpha/io.h linux/include/asm-alpha/io.h
    --- linux-2.1.109/include/asm-alpha/io.h Fri Jul 17 19:09:27 1998
    +++ linux/include/asm-alpha/io.h Fri Jul 17 20:31:43 1998
    @@ -99,20 +99,28 @@
    */
    #if defined(CONFIG_ALPHA_LCA)
    # include <asm/lca.h> /* get chip-specific definitions */
    +# define DENSE_MEM(x) LCA_DENSE_MEM
    #elif defined(CONFIG_ALPHA_APECS)
    # include <asm/apecs.h> /* get chip-specific definitions */
    +# define DENSE_MEM(x) APECS_DENSE_MEM
    #elif defined(CONFIG_ALPHA_CIA)
    # include <asm/cia.h> /* get chip-specific definitions */
    +# define DENSE_MEM(x) CIA_DENSE_MEM
    #elif defined(CONFIG_ALPHA_T2)
    # include <asm/t2.h> /* get chip-specific definitions */
    +# define DENSE_MEM(x) T2_DENSE_MEM
    #elif defined(CONFIG_ALPHA_PYXIS)
    # include <asm/pyxis.h> /* get chip-specific definitions */
    +# define DENSE_MEM(x) PYXIS_DENSE_MEM
    #elif defined(CONFIG_ALPHA_TSUNAMI)
    # include <asm/tsunami.h> /* get chip-specific definitions */
    +# warning DENSE_MEM undefined, TGA driver will not compile
    #elif defined(CONFIG_ALPHA_MCPCIA)
    # include <asm/mcpcia.h> /* get chip-specific definitions */
    +# warning DENSE_MEM undefined, TGA driver will not compile
    #else
    # include <asm/jensen.h>
    +# warning DENSE_MEM undefined, TGA driver will not compile
    #endif

    /*
    diff -urN linux-2.1.109/init/main.c linux/init/main.c
    --- linux-2.1.109/init/main.c Fri Jul 17 19:09:28 1998
    +++ linux/init/main.c Fri Jul 17 20:52:40 1998
    @@ -88,7 +88,9 @@
    #ifdef __i386__
    extern void ioapic_pirq_setup(char *str, int *ints);
    #endif
    +#ifdef CONFIG_VGA_CONSOLE
    extern void no_scroll(char *str, int *ints);
    +#endif
    extern void kbd_reset_setup(char *str, int *ints);
    extern void panic_setup(char *str, int *ints);
    extern void bmouse_setup(char *str, int *ints);
    @@ -536,7 +538,9 @@
    { "panic=", panic_setup },
    { "console=", console_setup },
    #ifdef CONFIG_VT
    +#ifdef CONFIG_VGA_CONSOLE
    { "no-scroll", no_scroll },
    +#endif
    { "kbd-reset", kbd_reset_setup },
    #endif
    #ifdef CONFIG_BUGi386
    diff -urN linux-2.1.109/scripts/ksymoops.cc linux/scripts/ksymoops.cc
    \
     
     \ /
      Last update: 2005-03-22 13:43    [W:0.030 / U:42.272 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site