Attachment #107855 for bug #163366

Line 7 Link Here

(-)file_not_specified_in_diff

Lines 107-113 Link Here

(-)usr.orig/src/kernel-modules/fritzcapi/fritz.classic/src/driver.c (-2 / +12 lines)
107	/---------------------------------------------------------------------------\	107	/---------------------------------------------------------------------------\
108	\---------------------------------------------------------------------------/	108	\---------------------------------------------------------------------------/
109	static void scheduler (unsigned long data);	109	static void scheduler (unsigned long data);
110	static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs);	110	static irqreturn_t irq_handler (int irq, void * args
		111	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
		112	, struct pt_regs * regs
		113	#endif
		114	);
111		115
112	static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0);	116	static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0);
113		117
Lines 805-815 Link Here
805		809
806	/---------------------------------------------------------------------------\	810	/---------------------------------------------------------------------------\
807	\---------------------------------------------------------------------------/	811	\---------------------------------------------------------------------------/
808	static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) {	812	static irqreturn_t irq_handler (int irq, void * args
		813	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
		814	, struct pt_regs * regs
		815	#endif
		816	) {
809	int res = IRQ_NONE;	817	int res = IRQ_NONE;
810		818
811	UNUSED_ARG (irq);	819	UNUSED_ARG (irq);
		820	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
812	UNUSED_ARG (regs);	821	UNUSED_ARG (regs);
		822	#endif
813	if (args != NULL) {	823	if (args != NULL) {
814	assert (capi_lib->cm_handle_events != NULL);	824	assert (capi_lib->cm_handle_events != NULL);
815	if (atomic_read (&scheduler_id) == smp_processor_id ()) {	825	if (atomic_read (&scheduler_id) == smp_processor_id ()) {

Lines 107-113 Link Here

(-)usr.orig/src/kernel-modules/fritzcapi/fritz.pci/src/driver.c (-2 / +12 lines)
107	/---------------------------------------------------------------------------\	107	/---------------------------------------------------------------------------\
108	\---------------------------------------------------------------------------/	108	\---------------------------------------------------------------------------/
109	static void scheduler (unsigned long data);	109	static void scheduler (unsigned long data);
110	static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs);	110	static irqreturn_t irq_handler (int irq, void * args
		111	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
		112	, struct pt_regs * regs
		113	#endif
		114	);
111		115
112	static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0);	116	static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0);
113		117
Lines 836-846 Link Here
836		840
837	/---------------------------------------------------------------------------\	841	/---------------------------------------------------------------------------\
838	\---------------------------------------------------------------------------/	842	\---------------------------------------------------------------------------/
839	static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) {	843	static irqreturn_t irq_handler (int irq, void * args
		844	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
		845	, struct pt_regs * regs
		846	#endif
		847	) {
840	int res = IRQ_NONE;	848	int res = IRQ_NONE;
841		849
842	UNUSED_ARG (irq);	850	UNUSED_ARG (irq);
		851	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
843	UNUSED_ARG (regs);	852	UNUSED_ARG (regs);
		853	#endif
844	if (args != NULL) {	854	if (args != NULL) {
845	assert (capi_lib->cm_handle_events != NULL);	855	assert (capi_lib->cm_handle_events != NULL);
846	if (atomic_read (&scheduler_id) == smp_processor_id ()) {	856	if (atomic_read (&scheduler_id) == smp_processor_id ()) {

Lines 107-113 Link Here

(-)usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.c (-2 / +12 lines)
107	/---------------------------------------------------------------------------\	107	/---------------------------------------------------------------------------\
108	\---------------------------------------------------------------------------/	108	\---------------------------------------------------------------------------/
109	static void scheduler (unsigned long data);	109	static void scheduler (unsigned long data);
110	static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs);	110	static irqreturn_t irq_handler (int irq, void * args
		111	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
		112	, struct pt_regs * regs
		113	#endif
		114	);
111		115
112	static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0);	116	static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0);
113		117
Lines 836-846 Link Here
836		840
837	/---------------------------------------------------------------------------\	841	/---------------------------------------------------------------------------\
838	\---------------------------------------------------------------------------/	842	\---------------------------------------------------------------------------/
839	static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) {	843	static irqreturn_t irq_handler (int irq, void * args
		844	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
		845	, struct pt_regs * regs
		846	#endif
		847	) {
840	int res = IRQ_NONE;	848	int res = IRQ_NONE;
841		849
842	UNUSED_ARG (irq);	850	UNUSED_ARG (irq);
		851	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
843	UNUSED_ARG (regs);	852	UNUSED_ARG (regs);
		853	#endif
844	if (args != NULL) {	854	if (args != NULL) {
845	assert (capi_lib->cm_handle_events != NULL);	855	assert (capi_lib->cm_handle_events != NULL);
846	if (atomic_read (&scheduler_id) == smp_processor_id ()) {	856	if (atomic_read (&scheduler_id) == smp_processor_id ()) {

Lines 107-113 Link Here

(-)usr.orig/src/kernel-modules/fritzcapi/fritz.pnp/src/driver.c (-2 / +12 lines)
107	/---------------------------------------------------------------------------\	107	/---------------------------------------------------------------------------\
108	\---------------------------------------------------------------------------/	108	\---------------------------------------------------------------------------/
109	static void scheduler (unsigned long data);	109	static void scheduler (unsigned long data);
110	static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs);	110	static irqreturn_t irq_handler (int irq, void * args
		111	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
		112	, struct pt_regs * regs
		113	#endif
		114	);
111		115
112	static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0);	116	static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0);
113		117
Lines 805-815 Link Here
805		809
806	/---------------------------------------------------------------------------\	810	/---------------------------------------------------------------------------\
807	\---------------------------------------------------------------------------/	811	\---------------------------------------------------------------------------/
808	static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) {	812	static irqreturn_t irq_handler (int irq, void * args
		813	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
		814	, struct pt_regs * regs
		815	#endif
		816	) {
809	int res = IRQ_NONE;	817	int res = IRQ_NONE;
810		818
811	UNUSED_ARG (irq);	819	UNUSED_ARG (irq);
		820	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
812	UNUSED_ARG (regs);	821	UNUSED_ARG (regs);
		822	#endif
813	if (args != NULL) {	823	if (args != NULL) {
814	assert (capi_lib->cm_handle_events != NULL);	824	assert (capi_lib->cm_handle_events != NULL);
815	if (atomic_read (&scheduler_id) == smp_processor_id ()) {	825	if (atomic_read (&scheduler_id) == smp_processor_id ()) {

Return to bug 163366