| View previous topic :: View next topic |
| Author |
Message |
Dawid159
Guru
Joined: 28 Jun 2004
Posts: 414
Location: /dev/Kłodzko
|
 Posted: Sun Oct 24, 2004 2:43 pm Post subject: Vivid 2.6.9 i ndiswrapper |
 |
|
Przy próbie kompilacji ndiswrapper dostaje następujący błąd | Code: | make -C driver install
make[1]: Entering directory `/tmp/ndiswrapper-0.11/driver'
make -C /lib/modules/2.6.9-vivid1/build SUBDIRS=/tmp/ndiswrapper-0.11/driver \
NDISWRAPPER_VERSION=0.11 \
EXTRA_VERSION= modules
make[2]: Entering directory `/usr/src/linux-2.6.9-vivid1'
CC [M] /tmp/ndiswrapper-0.11/driver/wrapper.o
/tmp/ndiswrapper-0.11/driver/wrapper.c: In function `ndis_suspend_pci':
/tmp/ndiswrapper-0.11/driver/wrapper.c:930: error: too many arguments to function `pci_save_state'
/tmp/ndiswrapper-0.11/driver/wrapper.c: In function `ndis_resume_pci':
/tmp/ndiswrapper-0.11/driver/wrapper.c:957: error: too many arguments to function `pci_restore_state'
/tmp/ndiswrapper-0.11/driver/wrapper.c: In function `ndis_init_one_pci':
/tmp/ndiswrapper-0.11/driver/wrapper.c:1525: error: too many arguments to function `pci_restore_state'
cc1: Brak dostêpu: opening dependency file /tmp/ndiswrapper-0.11/driver/.wrapper.o.d
make[3]: *** [/tmp/ndiswrapper-0.11/driver/wrapper.o] B³±d 1
make[2]: *** [_module_/tmp/ndiswrapper-0.11/driver] B³±d 2
make[2]: Leaving directory `/usr/src/linux-2.6.9-vivid1'
make[1]: *** [default] B³±d 2
make[1]: Leaving directory `/tmp/ndiswrapper-0.11/driver'
make: *** [install] B³±d 2 |
|
|
| Back to top |
|
 |
milu
Bodhisattva
Joined: 03 May 2004
Posts: 1122
Location: Poland, Konstancin-Jeziorna
|
| Posted: Sun Oct 24, 2004 2:51 pm Post subject: |
|
|
błędy podobne do moich z madwifi - to może wynikać z kolejnych zmian w sysctl 
_________________
Pozdrawiam,
Milu
------------------------------------
Registered Linux User: #246079
Zanim zadasz pytanie przeczytaj to dokładnie!! |
|
| Back to top |
|
|
Dawid159
Guru
Joined: 28 Jun 2004
Posts: 414
Location: /dev/Kłodzko
|
| Posted: Sun Oct 24, 2004 2:53 pm Post subject: |
|
|
Hmmm czyli czekam, aż ktoś to poprawi  |
|
| Back to top |
|
|
fallow
Bodhisattva
Joined: 08 Jan 2004
Posts: 2208
Location: Poland
|
| Posted: Sun Oct 24, 2004 5:55 pm Post subject: |
|
|
a probowales to zemergowac gdy link /usr/src/linux , wskazuje na jakiekolwiek zrodla 2.6.8.x ?
pozdro 
_________________
"Time is a companion that goes with us on a journey. It reminds us to cherish each moment, because it will never come again. What we leave behind is not as important as how we have lived" J-L. Picard  |
|
| Back to top |
|
|
Dawid159
Guru
Joined: 28 Jun 2004
Posts: 414
Location: /dev/Kłodzko
|
| Posted: Sun Oct 24, 2004 6:48 pm Post subject: |
|
|
| Przy /usr/src/linux wskazującym na linux-2.6.8-gentoo-r8 ndiswrapper dalej się nie kompiluje |
|
| Back to top |
|
|
_troll_
Bodhisattva
Joined: 04 Feb 2004
Posts: 1971
Location: Warszawa, Poland
|
| Posted: Sun Oct 24, 2004 11:27 pm Post subject: |
|
|
prosba do Ciebie Dawid - naloz ten patch na vivid'a:
http://marc.theaimsgroup.com/?l=linux-kernel&m=109492950330587&w=2
mozliwe, ze to rozwiaze problem...
Pozdrawiam,
Przemek
_________________
Życie jest jak pudełko czekoladek....
Nigdy nie wiesz na co trafisz" by mother of Forrest Gump |
|
| Back to top |
|
|
Dawid159
Guru
Joined: 28 Jun 2004
Posts: 414
Location: /dev/Kłodzko
|
| Posted: Mon Oct 25, 2004 8:30 am Post subject: |
|
|
Z miłą chęcią pomoge tylko mam mały problem z tym patchem Otóż na stronie którą podałeś nie widze opcji do ściagnięcia gotowego pliku więc skopiowałem fragment | Code: |
#define LINUX_HARDIRQ_H
#include <linux/config.h>
-#ifdef CONFIG_PREEPT
#include <linux/smp_lock.h>
-#endif
#include <asm/hardirq.h>
#define __IRQ_MASK(x) ((1UL << (x))-1)
#define in_irq() (hardirq_count())
#define in_softirq() (softirq_count())
#define in_interrupt() (irq_count())
-
-#define hardirq_trylock() (!in_interrupt())
-#define hardirq_endlock() do { } while (0)
#ifdef CONFIG_PREEMPT
# define in_atomic() ((preempt_count() & ~PREEMPT_ACTIVE) != kernel_locked()) |
i wtedy przy próbie patchowania źródeł dostaje | Code: | patch unexpectedly ends in middle of line
patch: **** Only garbage was found in the patch input. |
|
|
| Back to top |
|
|
nelchael
Retired Dev
Joined: 20 Mar 2004
Posts: 1948
Location: /dev/drzewo
|
| Posted: Mon Oct 25, 2004 8:46 am Post subject: |
|
|
To jest patch:
| Code: | --- 1.1/include/linux/hardirq.h 2004-09-08 08:32:57 +02:00
+++ edited/include/linux/hardirq.h 2004-09-10 16:11:31 +02:00
@@ -2,9 +2,7 @@
#define LINUX_HARDIRQ_H
#include <linux/config.h>
-#ifdef CONFIG_PREEPT
#include <linux/smp_lock.h>
-#endif
#include <asm/hardirq.h>
#define __IRQ_MASK(x) ((1UL << (x))-1)
@@ -28,9 +26,6 @@
#define in_irq() (hardirq_count())
#define in_softirq() (softirq_count())
#define in_interrupt() (irq_count())
-
-#define hardirq_trylock() (!in_interrupt())
-#define hardirq_endlock() do { } while (0)
#ifdef CONFIG_PREEMPT
# define in_atomic() ((preempt_count() & ~PREEMPT_ACTIVE) != kernel_locked()) |
_________________
[color=gray:17697d0166]http://dev.gentoo.org/~nelchael/[/color:17697d0166]
[size=14:17697d0166]>> [b:17697d0166]Zasady na f.g.o->Polish[/b:17697d0166] <<[/size:17697d0166] |
|
| Back to top |
|
|
Dawid159
Guru
Joined: 28 Jun 2004
Posts: 414
Location: /dev/Kłodzko
|
| Posted: Mon Oct 25, 2004 9:08 am Post subject: |
|
|
Tym razem jest | Code: | patching file include/linux/hardirq.h
Reversed (or previously applied) patch detected! Assume -R? [n] y
Hunk #1 succeeded at 2 with fuzz 1.
Hunk #2 FAILED at 28.
1 out of 2 hunks FAILED -- saving rejects to file include/linux/hardirq.h.rej
|
|
|
| Back to top |
|
|
nelchael
Retired Dev
Joined: 20 Mar 2004
Posts: 1948
Location: /dev/drzewo
|
| Posted: Mon Oct 25, 2004 9:24 am Post subject: |
|
|
To usun te piec linijek recznie
_________________
[color=gray:17697d0166]http://dev.gentoo.org/~nelchael/[/color:17697d0166]
[size=14:17697d0166]>> [b:17697d0166]Zasady na f.g.o->Polish[/b:17697d0166] <<[/size:17697d0166] |
|
| Back to top |
|
|
Dawid159
Guru
Joined: 28 Jun 2004
Posts: 414
Location: /dev/Kłodzko
|
| Posted: Mon Oct 25, 2004 9:32 am Post subject: |
|
|
Chodzi Ci o 5 linijek z patch czyli do postaci | Code: | --- 1.1/include/linux/hardirq.h 2004-09-08 08:32:57 +02:00
+++ edited/include/linux/hardirq.h 2004-09-10 16:11:31 +02:00
@@ -2,9 +2,7 @@
#define LINUX_HARDIRQ_H
#include <linux/config.h>
-#ifdef CONFIG_PREEPT
#include <linux/smp_lock.h>
-#endif
#include <asm/hardirq.h>
#define __IRQ_MASK(x) ((1UL << (x))-1)
@@ -28,9 +26,6 @@
#define in_irq() (hardirq_count())
#define in_softirq() (softirq_count())
#define in_interrupt() (irq_count())
-
|
| Code: | patching file include/linux/hardirq.h
Reversed (or previously applied) patch detected! Assume -R? [n] y
Hunk #1 succeeded at 2 with fuzz 1.
patch: **** malformed patch at line 17:
|
|
|
| Back to top |
|
|
nelchael
Retired Dev
Joined: 20 Mar 2004
Posts: 1948
Location: /dev/drzewo
|
| Posted: Mon Oct 25, 2004 10:16 am Post subject: |
|
|
Usun z pliku patchowanego, a nie z patcha!!!
Usun z pliku include/linux/hardirq.h kazda linijke, ktora w patchu jest oznaczona znakiem - na poczatku.
_________________
[color=gray:17697d0166]http://dev.gentoo.org/~nelchael/[/color:17697d0166]
[size=14:17697d0166]>> [b:17697d0166]Zasady na f.g.o->Polish[/b:17697d0166] <<[/size:17697d0166] |
|
| Back to top |
|
|
Dawid159
Guru
Joined: 28 Jun 2004
Posts: 414
Location: /dev/Kłodzko
|
| Posted: Mon Oct 25, 2004 1:11 pm Post subject: |
|
|
Hmm ponieważ linijki oznaczone w patchu znakiem - nie występowały w pliku hardirq.h to je dodałem w odpowiednie miejsca, czyli mój plik hardirq.h wygląda następująco | Code: | #ifndef LINUX_HARDIRQ_H
#define LINUX_HARDIRQ_H
#include <linux/config.h>
#ifdef CONFIG_PREEPT
#include <linux/smp_lock.h>
#endif
#include <asm/hardirq.h>
#ifdef CONFIG_GENERIC_HARDIRQS
/*
* We put the hardirq and softirq counter into the preemption
* counter. The bitmask has the following meaning:
*
* - bits 0-7 are the preemption count (max preemption depth: 256)
* - bits 8-15 are the softirq count (max # of softirqs: 256)
* - bits 16-27 are the hardirq count (max # of hardirqs: 4096)
*
* - ( bit 26 is the PREEMPT_ACTIVE flag. )
*
* PREEMPT_MASK: 0x000000ff
* SOFTIRQ_MASK: 0x0000ff00
* HARDIRQ_MASK: 0x0fff0000
*/
#define PREEMPT_BITS 8
#define SOFTIRQ_BITS 8
#define HARDIRQ_BITS 12
#define PREEMPT_SHIFT 0
#define SOFTIRQ_SHIFT (PREEMPT_SHIFT + PREEMPT_BITS)
#define HARDIRQ_SHIFT (SOFTIRQ_SHIFT + SOFTIRQ_BITS)
/*
* The hardirq mask has to be large enough to have
* space for potentially all IRQ sources in the system
* nesting on a single CPU:
*/
#if (1 << HARDIRQ_BITS) < NR_IRQS
# error HARDIRQ_BITS is too low!
#endif
#endif /* CONFIG_GENERIC_HARDIRQS */
#define __IRQ_MASK(x) ((1UL << (x))-1)
#define PREEMPT_MASK (__IRQ_MASK(PREEMPT_BITS) << PREEMPT_SHIFT)
#define HARDIRQ_MASK (__IRQ_MASK(HARDIRQ_BITS) << HARDIRQ_SHIFT)
#define SOFTIRQ_MASK (__IRQ_MASK(SOFTIRQ_BITS) << SOFTIRQ_SHIFT)
#define PREEMPT_OFFSET (1UL << PREEMPT_SHIFT)
#define SOFTIRQ_OFFSET (1UL << SOFTIRQ_SHIFT)
#define HARDIRQ_OFFSET (1UL << HARDIRQ_SHIFT)
#define hardirq_count() (preempt_count() & HARDIRQ_MASK)
#define softirq_count() (preempt_count() & SOFTIRQ_MASK)
#define irq_count() (preempt_count() & (HARDIRQ_MASK | SOFTIRQ_MASK))
/*
* Are we doing bottom half or hardware interrupt processing?
* Are we in a softirq context? Interrupt context?
*/
#define in_irq() (hardirq_count())
#define in_softirq() (softirq_count())
#define in_interrupt() (irq_count())
#define hardirq_trylock() (!in_interrupt())
#define hardirq_endlock() do { } while (0)
#ifdef CONFIG_PREEMPT
# define in_atomic() ((preempt_count() & ~PREEMPT_ACTIVE) != kernel_locked())
# define preemptible() (preempt_count() == 0 && !irqs_disabled())
# define IRQ_EXIT_OFFSET (HARDIRQ_OFFSET-1)
#else
# define in_atomic() (preempt_count() != 0)
# define preemptible() 0
# define IRQ_EXIT_OFFSET HARDIRQ_OFFSET
#endif
#ifdef CONFIG_SMP
extern void synchronize_irq(unsigned int irq);
#else
# define synchronize_irq(irq) barrier()
#endif
#ifdef CONFIG_GENERIC_HARDIRQS
#define nmi_enter() (preempt_count() += HARDIRQ_OFFSET)
#define nmi_exit() (preempt_count() -= HARDIRQ_OFFSET)
#define irq_enter() (preempt_count() += HARDIRQ_OFFSET)
extern void irq_exit(void);
#endif
#endif /* LINUX_HARDIRQ_H */ |
Jednak po kompilacji jądra problem z ndiswrapperem się powtarza |
|
| Back to top |
|
|
fallow
Bodhisattva
Joined: 08 Jan 2004
Posts: 2208
Location: Poland
|
| Posted: Mon Oct 25, 2004 1:42 pm Post subject: |
|
|
to problem panow od ndiswrapper`a
zmienilo sie /include/linux/pci.h
w pliku ndiswrapper-0.11/driver/wrapper.c zmien :
( pewnie masz go w var/tmp/portage/ndiswrapper-xxx )
| Code: |
pci_save_state(pdev,handle->pci_state);
na
pci_save_state(pdev);
|
oraz wystapienia
| Code: |
pci_restore_state(pdev,handle->pci_state); lub pci_restore_state(pdev,NULL);
na :
pci_restore_state(pdev);
|
pozdro
_________________
"Time is a companion that goes with us on a journey. It reminds us to cherish each moment, because it will never come again. What we leave behind is not as important as how we have lived" J-L. Picard
Last edited by fallow on Mon Oct 25, 2004 9:17 pm; edited 1 time in total |
|
| Back to top |
|
|
Dawid159
Guru
Joined: 28 Jun 2004
Posts: 414
Location: /dev/Kłodzko
|
| Posted: Mon Oct 25, 2004 2:28 pm Post subject: |
|
|
No już prawie dobrze Podczas kompilacji | Code: | In file included from /tmp/ndiswrapper-0.11/driver/ntoskernel.h:17,
from /tmp/ndiswrapper-0.11/driver/ndis.h:18,
from /tmp/ndiswrapper-0.11/driver/iw_ndis.h:18,
from /tmp/ndiswrapper-0.11/driver/iw_ndis.c:24:
/tmp/ndiswrapper-0.11/driver/ndiswrapper.h: In function `wrap_spin_lock':
/tmp/ndiswrapper-0.11/driver/ndiswrapper.h:324: warning: implicit declaration of function `kernel_locked'
CC [M] /tmp/ndiswrapper |
pod koniec | Code: | | *** Warning: "kernel_locked" [/tmp/ndiswrapper-0.11/driver/ndiswrapper.ko] undefined! |
próba załadowania modułu | Code: | bash-2.05b# modprobe ndiswrapper
FATAL: Error inserting ndiswrapper (/lib/modules/2.6.9-vivid1/misc/ndiswrapper.ko): Unknown symbol in module, or unknown parameter (see dmesg) |
i na koniec dmesg | Code: | | ndiswrapper: Unknown symbol kernel_locked |
Pozdrawiam |
|
| Back to top |
|
|
fallow
Bodhisattva
Joined: 08 Jan 2004
Posts: 2208
Location: Poland
|
| Posted: Mon Oct 25, 2004 3:23 pm Post subject: |
|
|
nie mam teraz czasu by w to zagladnac ale wydaje mi sie ze moze chodzic o nick`sa. sproboj to samo zrobic na jajku z innym cpu schedulerem , albo przekompilowac jajko bez preemptingu ..ale to takie strzaly , nie wiem czy to cos da
pozdro
_________________
"Time is a companion that goes with us on a journey. It reminds us to cherish each moment, because it will never come again. What we leave behind is not as important as how we have lived" J-L. Picard |
|
| Back to top |
|
|
|
Polskie forum (Polish)
