[PATCH] missed ia64 pt_regs fixes (5dcded1b) · Commits · e / devices / android_kernel_xiaomi_markw

arch/ia64/hp/sim/simeth.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -54,7 +54,7 @@ static int simeth_close(struct net_device *dev);
	static int simeth_tx(struct sk_buff skb, struct net_device dev);		static int simeth_tx(struct sk_buff skb, struct net_device dev);
	static int simeth_rx(struct net_device *dev);		static int simeth_rx(struct net_device *dev);
	static struct net_device_stats simeth_get_stats(struct net_device dev);		static struct net_device_stats simeth_get_stats(struct net_device dev);
	static irqreturn_t simeth_interrupt(int irq, void dev_id, struct pt_regs regs);		static irqreturn_t simeth_interrupt(int irq, void *dev_id);
	static void set_multicast_list(struct net_device *dev);		static void set_multicast_list(struct net_device *dev);
	static int simeth_device_event(struct notifier_block this,unsigned long event, void ptr);		static int simeth_device_event(struct notifier_block this,unsigned long event, void ptr);

	@@ -497,7 +497,7 @@ simeth_rx(struct net_device *dev)
	* Interrupt handler (Yes, we can do it too !!!)		* Interrupt handler (Yes, we can do it too !!!)
	*/		*/
	static irqreturn_t		static irqreturn_t
	simeth_interrupt(int irq, void dev_id, struct pt_regs regs)		simeth_interrupt(int irq, void *dev_id)
	{		{
	struct net_device *dev = dev_id;		struct net_device *dev = dev_id;

arch/ia64/hp/sim/simserial.c

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -130,7 +130,7 @@ static void rs_start(struct tty_struct *tty)
	#endif		#endif
	}		}

	static void receive_chars(struct tty_struct tty, struct pt_regs regs)		static void receive_chars(struct tty_struct *tty)
	{		{
	unsigned char ch;		unsigned char ch;
	static unsigned char seen_esc = 0;		static unsigned char seen_esc = 0;
	@@ -152,7 +152,7 @@ static void receive_chars(struct tty_struct tty, struct pt_regs regs)
	ch = ia64_ssc(0, 0, 0, 0,		ch = ia64_ssc(0, 0, 0, 0,
	SSC_GETCHAR);		SSC_GETCHAR);
	while (!ch);		while (!ch);
	handle_sysrq(ch, regs, NULL);		handle_sysrq(ch, NULL);
	}		}
	#endif		#endif
	seen_esc = 0;		seen_esc = 0;
	@@ -170,7 +170,7 @@ static void receive_chars(struct tty_struct tty, struct pt_regs regs)
	/*		/*
	* This is the serial driver's interrupt routine for a single port		* This is the serial driver's interrupt routine for a single port
	*/		*/
	static irqreturn_t rs_interrupt_single(int irq, void dev_id, struct pt_regs regs)		static irqreturn_t rs_interrupt_single(int irq, void *dev_id)
	{		{
	struct async_struct * info;		struct async_struct * info;

	@@ -187,7 +187,7 @@ static irqreturn_t rs_interrupt_single(int irq, void dev_id, struct pt_regs r
	* pretty simple in our case, because we only get interrupts		* pretty simple in our case, because we only get interrupts
	* on inbound traffic		* on inbound traffic
	*/		*/
	receive_chars(info->tty, regs);		receive_chars(info->tty);
	return IRQ_HANDLED;		return IRQ_HANDLED;
	}		}

	@@ -714,7 +714,7 @@ startup(struct async_struct *info)
	{		{
	unsigned long flags;		unsigned long flags;
	int retval=0;		int retval=0;
	irqreturn_t (handler)(int, void , struct pt_regs *);		irqreturn_t (handler)(int, void );
	struct serial_state *state= info->state;		struct serial_state *state= info->state;
	unsigned long page;		unsigned long page;

arch/ia64/sn/kernel/xpc_main.c

+2 −5

include/asm-ia64/sn/xpc.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -669,7 +669,7 @@ extern struct device *xpc_part;
	extern struct device *xpc_chan;		extern struct device *xpc_chan;
	extern int xpc_disengage_request_timelimit;		extern int xpc_disengage_request_timelimit;
	extern int xpc_disengage_request_timedout;		extern int xpc_disengage_request_timedout;
	extern irqreturn_t xpc_notify_IRQ_handler(int, void , struct pt_regs );		extern irqreturn_t xpc_notify_IRQ_handler(int, void *);
	extern void xpc_dropped_IPI_check(struct xpc_partition *);		extern void xpc_dropped_IPI_check(struct xpc_partition *);
	extern void xpc_activate_partition(struct xpc_partition *);		extern void xpc_activate_partition(struct xpc_partition *);
	extern void xpc_activate_kthreads(struct xpc_channel *, int);		extern void xpc_activate_kthreads(struct xpc_channel *, int);

Original line number	Original line	Diff line number	Diff line
	@@ -222,7 +222,7 @@ xpc_timeout_partition_disengage_request(unsigned long data)
	* Notify the heartbeat check thread that an IRQ has been received.		* Notify the heartbeat check thread that an IRQ has been received.
	*/		*/
	static irqreturn_t		static irqreturn_t
	xpc_act_IRQ_handler(int irq, void dev_id, struct pt_regs regs)		xpc_act_IRQ_handler(int irq, void *dev_id)
	{		{
	atomic_inc(&xpc_act_IRQ_rcvd);		atomic_inc(&xpc_act_IRQ_rcvd);
	wake_up_interruptible(&xpc_act_IRQ_wq);		wake_up_interruptible(&xpc_act_IRQ_wq);
	@@ -607,12 +607,9 @@ xpc_activate_partition(struct xpc_partition *part)
	* irq - Interrupt ReQuest number. NOT USED.		* irq - Interrupt ReQuest number. NOT USED.
	*		*
	* dev_id - partid of IPI's potential sender.		* dev_id - partid of IPI's potential sender.
	*
	* regs - processor's context before the processor entered
	* interrupt code. NOT USED.
	*/		*/
	irqreturn_t		irqreturn_t
	xpc_notify_IRQ_handler(int irq, void dev_id, struct pt_regs regs)		xpc_notify_IRQ_handler(int irq, void *dev_id)
	{		{
	partid_t partid = (partid_t) (u64) dev_id;		partid_t partid = (partid_t) (u64) dev_id;
	struct xpc_partition *part = &xpc_partitions[partid];		struct xpc_partition *part = &xpc_partitions[partid];