Re: Athlon patch. (Was:Re: Driver used by Xorg)

[Ivan Shmakov]

> > > > > "JLAS" == Jose Luis Alarcon Sanchez <jlalarcon@unlimitedmail.org> writes:

>> Could you try with the attached patch instead of my previous patch?

>> Note: this patch is what Linux always does.

[...]

>>             template |= INTEL_PTE_WRITE;
>> +       if (machine_slot[cpu_number()].cpu_type >= CPU_TYPE_I486
>> +           && pa >= phys_last_addr)
>> +           template |= INTEL_PTE_NCACHE|INTEL_PTE_WTHRU;
>>         if (wired)

       NB: the original message has TABs (^I, ASCII 9) here.  Like the
       file you're trying to patch, I guess.

[...]

JLAS> Can't understand why:

> /usr/src/gnumach# patch -p0 < patch_04.patch
> patching file i386/intel/pmap.c
> Hunk #1 FAILED at 1506.
> Hunk #2 FAILED at 1618.
> 2 out of 2 hunks FAILED -- saving rejects to file i386/intel/pmap.c.rej
> /usr/src/gnumach#

[...]

>                  template |= INTEL_PTE_WRITE;
> +            if (machine_slot[cpu_number()].cpu_type >= CPU_TYPE_I486
> +                && pa >= phys_last_addr)
> +                template |= INTEL_PTE_NCACHE|INTEL_PTE_WTHRU;
>              if (wired)

       ... While here are the spaces (ASCII 32).

[...]

JLAS> Can you see the "problem"?.

       Looks like ``TABs vs. spaces'' problem.  How did you put the
       attachment's contents into `patch_04.patch'?  Might it be that
       TABs were expanded to spaces?  You should try to avoid the
       expansion, or you may use the `--ignore-whitespace' option to
       `patch'.